Skip to content

Commit

Permalink
Merge pull request #106 from mremi/master
Browse files Browse the repository at this point in the history
Upgrade versions
  • Loading branch information
mremi authored May 18, 2018
2 parents 3d61278 + 6427c7e commit 29da173
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 10 deletions.
12 changes: 6 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ matrix:
include:
- env: LANGUAGE=ansible VERSION=2.3.0.0-r1 PYTHON_VERSION=2.7.14-r0
- env: LANGUAGE=aws VERSION=1
- env: LANGUAGE=dind-aws VERSION=1 DOCKER_COMPOSE_VERSION=1.20.1 GLIBC_VERSION=2.23-r3
- env: LANGUAGE=dind-aws VERSION=1 DOCKER_COMPOSE_VERSION=1.21.2 GLIBC_VERSION=2.23-r3
- env: LANGUAGE=golang VERSION=1.9 GLIDE_VERSION=v0.13.1
- env: LANGUAGE=java VERSION=8 JAVA_VERSION=8u171-1~webupd8~0
- env: LANGUAGE=node VERSION=6.14 NODE_VERSION=6.14.1 NPM_VERSION=3.10.10
- env: LANGUAGE=node VERSION=8.11 NODE_VERSION=8.11.1 NPM_VERSION=5.6.0
- env: LANGUAGE=node VERSION=9.10 NODE_VERSION=9.10.1 NPM_VERSION=5.6.0
- env: LANGUAGE=node VERSION=6.14 NODE_VERSION=6.14.2 NPM_VERSION=3.10.10
- env: LANGUAGE=node VERSION=8.11 NODE_VERSION=8.11.2 NPM_VERSION=5.6.0
- env: LANGUAGE=node VERSION=9.11 NODE_VERSION=9.11.1 NPM_VERSION=5.6.0
- env: LANGUAGE=php VERSION=5.3 PHP_VERSION=5.3.10 PHP_BUILD_INSTALL_EXTENSION=apcu=4.0.11 REDIS_VERSION=3.1.6 SECURITY_CHECKER_VERSION=2.0.6
- env: LANGUAGE=php VERSION=5.6 PHP_VERSION=5.6.35-cli-alpine APCU_VERSION=4.0.11 COMPOSER_VERSION=1.6.3 REDIS_VERSION=4.0.0 SECURITY_CHECKER_VERSION=4.1.6 XDEBUG_VERSION=XDEBUG_2_5_5
- env: LANGUAGE=php VERSION=7.1 PHP_VERSION=7.1.16-cli-alpine APCU_VERSION=5.1.11 COMPOSER_VERSION=1.6.3 REDIS_VERSION=4.0.0 SECURITY_CHECKER_VERSION=4.1.8 XDEBUG_VERSION=2.6.0
- env: LANGUAGE=php VERSION=5.6 PHP_VERSION=5.6.36-cli-alpine APCU_VERSION=4.0.11 COMPOSER_VERSION=1.6.5 REDIS_VERSION=4.0.2 SECURITY_CHECKER_VERSION=4.1.6 XDEBUG_VERSION=XDEBUG_2_5_5
- env: LANGUAGE=php VERSION=7.1 PHP_VERSION=7.1.17-cli-alpine APCU_VERSION=5.1.11 COMPOSER_VERSION=1.6.5 REDIS_VERSION=4.0.2 SECURITY_CHECKER_VERSION=4.1.8 XDEBUG_VERSION=2.6.0
- env: LANGUAGE=python VERSION=2.7 PYTHON_VERSION=2.7.15
- env: LANGUAGE=python VERSION=3.6 PYTHON_VERSION=3.6.5
- env: LANGUAGE=react-native VERSION=1 JAVA_VERSION=8u171-1~webupd8~0
Expand Down
12 changes: 10 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
Versions
========

2018-04-DEV
-----------
2018-05-18
----------

* Upgrade Docker version to 18.05.0 and Docker Compose to 1.21.2 in dind-aws image
* Upgrade Node version: 6.14.2, 8.11.2, 9.11.1
* Upgrade PHP version: 5.6.36, 7.1.17
* Upgrade Composer version: 1.6.5
* Upgrade PHP Redis version: 4.0.2
* Upgrade Ruby version: 2.5.1
* Add Python images: versions 2.7 and 3.6
* Add tests on PHP images
* Add React Native image
* Upgrade Java version: 8u171-1\~webupd8\~0
* Fix intl in PHP images

Expand Down
2 changes: 1 addition & 1 deletion dind-aws/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker:18.03.0-ce-dind
FROM docker:18.05.0-ce-dind
LABEL maintainer="Rémi Marseille <[email protected]>"

ARG CI_HELPER_VERSION
Expand Down
2 changes: 1 addition & 1 deletion ruby/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:2.5.0-alpine
FROM ruby:2.5.1-alpine
LABEL maintainer="Rémi Marseille <[email protected]>"

ARG CI_HELPER_VERSION
Expand Down

0 comments on commit 29da173

Please sign in to comment.