Skip to content

Commit

Permalink
Merge pull request #37 from ekino/upgrade_version
Browse files Browse the repository at this point in the history
Upgrade version
  • Loading branch information
rande authored Jan 6, 2017
2 parents 33a7f75 + 0960705 commit 8b3b13d
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 9 deletions.
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ services:

matrix:
include:
- env: LANGUAGE=node VERSION=4.7 MODD_VERSION=0.4 NODE_VERSION=4.7.0
- env: LANGUAGE=node VERSION=6.9 MODD_VERSION=0.4 NODE_VERSION=6.9.2
- env: LANGUAGE=node VERSION=7.2 MODD_VERSION=0.4 NODE_VERSION=7.2.1
- env: LANGUAGE=node VERSION=4.7 MODD_VERSION=0.4 NODE_VERSION=4.7.2
- env: LANGUAGE=node VERSION=6.9 MODD_VERSION=0.4 NODE_VERSION=6.9.4
- env: LANGUAGE=node VERSION=7.4 MODD_VERSION=0.4 NODE_VERSION=7.4.0
- env: LANGUAGE=java VERSION=8 MODD_VERSION=0.4 JAVA_VERSION=8u111+8u111arm-1~webupd8~0
- env: LANGUAGE=php VERSION=5.6 MODD_VERSION=0.4 PHP_VERSION=5.6.28 PHP_BUILD_INSTALL_EXTENSION=apcu=4.0.11
- env: LANGUAGE=php VERSION=7.0 MODD_VERSION=0.4 PHP_VERSION=7.0.13 PHP_BUILD_INSTALL_EXTENSION=apcu=5.1.7
- env: LANGUAGE=php VERSION=5.6 MODD_VERSION=0.4 PHP_VERSION=5.6.29 PHP_BUILD_INSTALL_EXTENSION=apcu=4.0.11
- env: LANGUAGE=php VERSION=7.0 MODD_VERSION=0.4 PHP_VERSION=7.0.14 PHP_BUILD_INSTALL_EXTENSION=apcu=5.1.7
- env: LANGUAGE=aws VERSION=1
- env: LANGUAGE=dind-aws VERSION=1

Expand Down
13 changes: 10 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,21 @@
Versions
========

2017-01-DEV
2017-02-DEV
-----------

* To do .. update version ...

2017-01-06
----------

* Add a new AWS image with awscli and python libs
* Add CI-Helper 0.0.1 into base image
* Add CI-Helper 0.0.2 into base image
* Add a new DIND AWS image with AWS Cli
* Add CI-Helper to 0.0.2 on all images
* Add Modd 0.0.4 into base image
* Upgrade Node version: 4.7.2, 6.9.4, 7.4.0
* Upgrade PHP version: 5.6.29, 7.0.14
* Upgrade composer version: 1.3.0

2016.12-19
----------
Expand Down
2 changes: 1 addition & 1 deletion php/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ENV DEBIAN_FRONTEND=noninteractive \
COMPOSER_NO_INTERACTION=1 \
PATH=/root/.phpenv/versions/current/bin:usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \
PHP_BUILD_CONFIGURE_OPTS="--with-pdo-pgsql --disable-phpdbg --disable-cgi" \
COMPOSER_VERSION=1.2.4
COMPOSER_VERSION=1.3.0

ARG PHP_VERSION
ARG PHP_BUILD_INSTALL_EXTENSION
Expand Down

0 comments on commit 8b3b13d

Please sign in to comment.