Merge pull request #83 from mremi/master

Upgrade versions and add tzdata into sonar
ekino · Dec 12, 2017 · 3bd57e9 · 3bd57e9
2 parents 548a08a + 6cf15f3
commit 3bd57e9
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 14 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,16 +7,16 @@ services:
 
 matrix:
   include:
-    - env: LANGUAGE=node     VERSION=6.11 NODE_VERSION=6.11.3 NPM_VERSION=3.10.10
-    - env: LANGUAGE=node     VERSION=8.9  NODE_VERSION=8.9.1  NPM_VERSION=5.5.1
-    - env: LANGUAGE=node     VERSION=9.2  NODE_VERSION=9.2.0  NPM_VERSION=5.5.1
+    - env: LANGUAGE=node     VERSION=6.12 NODE_VERSION=6.12.2 NPM_VERSION=3.10.10
+    - env: LANGUAGE=node     VERSION=8.9  NODE_VERSION=8.9.3  NPM_VERSION=5.5.1
+    - env: LANGUAGE=node     VERSION=9.2  NODE_VERSION=9.2.1  NPM_VERSION=5.5.1
     - env: LANGUAGE=java     VERSION=8    JAVA_VERSION=8u151-1~webupd8~0
     - env: LANGUAGE=php      VERSION=5.3  PHP_VERSION=5.3.10 PHP_BUILD_INSTALL_EXTENSION=apcu=4.0.11 REDIS_VERSION=3.1.4 SECURITY_CHECKER_VERSION=2.0.6
-    - env: LANGUAGE=php      VERSION=5.6  PHP_VERSION=5.6.31 PHP_BUILD_INSTALL_EXTENSION=apcu=4.0.11 REDIS_VERSION=3.1.4 SECURITY_CHECKER_VERSION=4.1.6
-    - env: LANGUAGE=php      VERSION=7.1  PHP_VERSION=7.1.9  PHP_BUILD_INSTALL_EXTENSION=apcu=5.1.8  REDIS_VERSION=3.1.4 SECURITY_CHECKER_VERSION=4.1.6
+    - env: LANGUAGE=php      VERSION=5.6  PHP_VERSION=5.6.32 PHP_BUILD_INSTALL_EXTENSION=apcu=4.0.11 REDIS_VERSION=3.1.4 SECURITY_CHECKER_VERSION=4.1.6
+    - env: LANGUAGE=php      VERSION=7.1  PHP_VERSION=7.1.12 PHP_BUILD_INSTALL_EXTENSION=apcu=5.1.8  REDIS_VERSION=3.1.4 SECURITY_CHECKER_VERSION=4.1.6
     - env: LANGUAGE=aws      VERSION=1
-    - env: LANGUAGE=dind-aws VERSION=1    DOCKER_COMPOSE_VERSION=1.16.1
-    - env: LANGUAGE=golang   VERSION=1.9  GLIDE_VERSION=v0.13.0
+    - env: LANGUAGE=dind-aws VERSION=1    DOCKER_COMPOSE_VERSION=1.17.1
+    - env: LANGUAGE=golang   VERSION=1.9  GLIDE_VERSION=v0.13.1
     - env: LANGUAGE=ruby     VERSION=2.4
     - env: LANGUAGE=ansible  VERSION=2.3.0.0-r1 PYTHON_VERSION=2.7.13-r1 GLIBC_VERSION=2.26-r0
     - env: LANGUAGE=sonar    VERSION=3.0  SONARSCANNER_VERSION=3.0.3.778

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,16 @@
 Versions
 ========
 
-2017-12-DEV
------------
+2017-12-12
+----------
 
-* Upgrade Node version: 8.9.1, 9.2.0
+* Add tzdata into sonar image
+* Upgrade Ruby version: 2.4.2
+* Upgrade Glide version: 0.13.1
+* Upgrade Docker Compose version: 1.17.1
+* Upgrade Composer version: 1.5.5
+* Upgrade PHP version: 5.6.32, 7.1.12
+* Upgrade Node version: 6.12.2, 8.9.3, 9.2.1
 * Allow specifying NPM version in Node image :
     - node v6.11.3 -> npm v3.10.10
     - node v8.9.1  -> npm v5.5.1

diff --git a/php/Dockerfile b/php/Dockerfile
@@ -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 --enable-intl " \
-    COMPOSER_VERSION=1.4.2
+    COMPOSER_VERSION=1.5.5
 
 ARG PHP_VERSION
 ARG PHP_BUILD_INSTALL_EXTENSION

diff --git a/ruby/Dockerfile b/ruby/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.4.1-alpine
+FROM ruby:2.4.2-alpine
 MAINTAINER Rémi Marseille <[email protected]>
 
 ARG CI_HELPER_VERSION

diff --git a/sonar/Dockerfile b/sonar/Dockerfile
@@ -8,9 +8,9 @@ ARG SONARSCANNER_VERSION
 ARG CI_HELPER_VERSION
 
 RUN echo "Starting ..." && \
-    apk --update upgrade && apk add curl unzip make && \
+    apk --update upgrade && apk add curl make tzdata unzip && \
     echo "Done base install!" && \
-    
+
     echo "Starting Sonar Scanner" && \
     curl --insecure -o ./sonarscanner.zip -L https://sonarsource.bintray.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONARSCANNER_VERSION}-linux.zip && \
     unzip sonarscanner.zip && \