Merge pull request #93 from mremi/master

Fix issue with iconv in PHP image and use Alpine binary of ci-helper

.travis.yml

@@ -7,19 +7,19 @@ services:
 
 matrix:
   include:
+    - env: LANGUAGE=ansible  VERSION=2.3.0.0-r1 PYTHON_VERSION=2.7.13-r1
+    - env: LANGUAGE=aws      VERSION=1
+    - env: LANGUAGE=dind-aws VERSION=1    DOCKER_COMPOSE_VERSION=1.18.0 GLIBC_VERSION=2.23-r3
+    - env: LANGUAGE=golang   VERSION=1.9  GLIDE_VERSION=v0.13.1
+    - env: LANGUAGE=java     VERSION=8    JAVA_VERSION=8u161-1~webupd8~0
     - env: LANGUAGE=node     VERSION=6.12 NODE_VERSION=6.12.3 NPM_VERSION=3.10.10
     - env: LANGUAGE=node     VERSION=8.9  NODE_VERSION=8.9.4  NPM_VERSION=5.6.0
     - env: LANGUAGE=node     VERSION=9.4  NODE_VERSION=9.4.0  NPM_VERSION=5.6.0
-    - env: LANGUAGE=java     VERSION=8    JAVA_VERSION=8u161-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.6 SECURITY_CHECKER_VERSION=2.0.6
-    - env: LANGUAGE=php      VERSION=5.6  PHP_VERSION=5.6.33-cli-alpine APCU_VERSION=4.0.11 COMPOSER_VERSION=1.6.2 GLIBC_VERSION=2.26-r0 REDIS_VERSION=3.1.6 SECURITY_CHECKER_VERSION=4.1.6 XDEBUG_VERSION=2_5_5
-    - env: LANGUAGE=php      VERSION=7.1  PHP_VERSION=7.1.13-cli-alpine APCU_VERSION=5.1.9  COMPOSER_VERSION=1.6.2 GLIBC_VERSION=2.26-r0 REDIS_VERSION=3.1.6 SECURITY_CHECKER_VERSION=4.1.7 XDEBUG_VERSION=2_5_5
-    - env: LANGUAGE=aws      VERSION=1
-    - env: LANGUAGE=dind-aws VERSION=1    DOCKER_COMPOSE_VERSION=1.18.0
-    - env: LANGUAGE=golang   VERSION=1.9  GLIDE_VERSION=v0.13.1
+    - env: LANGUAGE=php      VERSION=5.6  PHP_VERSION=5.6.33-cli-alpine APCU_VERSION=4.0.11 COMPOSER_VERSION=1.6.2 REDIS_VERSION=3.1.6 SECURITY_CHECKER_VERSION=4.1.6 XDEBUG_VERSION=2_5_5
+    - env: LANGUAGE=php      VERSION=7.1  PHP_VERSION=7.1.13-cli-alpine APCU_VERSION=5.1.9  COMPOSER_VERSION=1.6.2 REDIS_VERSION=3.1.6 SECURITY_CHECKER_VERSION=4.1.7 XDEBUG_VERSION=2_5_5
     - env: LANGUAGE=ruby     VERSION=2.5
-    - 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
+    - env: LANGUAGE=sonar    VERSION=3.0  GLIBC_VERSION=2.23-r3 SONARSCANNER_VERSION=3.0.3.778
 
 script:
     - travis_wait python travis.py

CHANGELOG.md

@@ -4,6 +4,8 @@ Versions
 2018-01-DEV
 -----------
 
+* Use Alpine binary of ci-helper for Ansible, AWS, DIND-AWS, PHP >= 5.6, Ruby and Sonar images
+* Fix deprecated MAINTAINER instruction
 * BC break: PHP image is now based on Alpine
     - intl for PHP 7.2 is not released yet, so image 7.2 is not available anymore
 * Upgrade modd version: 0.5

ansible/Dockerfile

@@ -1,7 +1,6 @@
 FROM alpine:3.6
 
 ARG CI_HELPER_VERSION
-ARG GLIBC_VERSION
 ARG PYTHON_VERSION
 ARG VERSION
 
@@ -10,10 +9,6 @@ RUN echo "Install Ansible with deps" && \
     apk --update --no-cache add bash ca-certificates curl git openssh-client python=${PYTHON_VERSION} py-pip ansible=${VERSION} && \
     echo "Done install Ansible with deps" &&\
     echo "Install CI Helper" && \
-    curl -sSL https://github.com/sgerrand/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/sgerrand.rsa.pub -o /etc/apk/keys/sgerrand.rsa.pub && \
-    curl -sSL https://github.com/sgerrand/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/glibc-${GLIBC_VERSION}.apk -O && \
-    apk add -q glibc-${GLIBC_VERSION}.apk && \
-    rm /etc/apk/keys/sgerrand.rsa.pub glibc-${GLIBC_VERSION}.apk && \
-    curl -sSL https://github.com/rande/gitlab-ci-helper/releases/download/${CI_HELPER_VERSION}/linux-amd64-gitlab-ci-helper -o /usr/bin/ci-helper && \
+    curl -sSL https://github.com/rande/gitlab-ci-helper/releases/download/${CI_HELPER_VERSION}/alpine-amd64-gitlab-ci-helper -o /usr/bin/ci-helper && \
     chmod 755 /usr/bin/ci-helper && \
-    echo "Done install CI Helper"
+    echo "Done install CI Helper"

aws/Dockerfile

@@ -1,5 +1,5 @@
 FROM alpine:3.4
-MAINTAINER Frank Pavageau <[email protected]>
+LABEL maintainer="Frank Pavageau <[email protected]>"
 
 ARG CI_HELPER_VERSION
 
@@ -10,10 +10,6 @@ RUN echo "Install AWS" && \
     echo "Done install AWS" && \
 
     echo "Install CI Helper" && \
-    curl -sSL https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.23-r3/sgerrand.rsa.pub -o /etc/apk/keys/sgerrand.rsa.pub && \
-    curl -sSL https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.23-r3/glibc-2.23-r3.apk -O && \
-    apk add -q glibc-2.23-r3.apk && \
-    rm /etc/apk/keys/sgerrand.rsa.pub glibc-2.23-r3.apk && \
-    curl -sSL https://github.com/rande/gitlab-ci-helper/releases/download/${CI_HELPER_VERSION}/linux-amd64-gitlab-ci-helper -o /usr/bin/ci-helper && \
+    curl -sSL https://github.com/rande/gitlab-ci-helper/releases/download/${CI_HELPER_VERSION}/alpine-amd64-gitlab-ci-helper -o /usr/bin/ci-helper && \
     chmod 755 /usr/bin/ci-helper && \
     echo "Done install CI Helper"

dind-aws/Dockerfile

@@ -1,26 +1,26 @@
 FROM docker:18.01.0-ce-dind
-MAINTAINER Rémi Marseille <[email protected]>
+LABEL maintainer="Rémi Marseille <[email protected]>"
 
 ARG CI_HELPER_VERSION
 ARG DOCKER_COMPOSE_VERSION
-ARG GLIBC_VERSION=2.23-r3
+ARG GLIBC_VERSION
 
 RUN echo "Install AWS" && \
     apk add -q --no-cache bash ca-certificates curl git make openssh-client python py-pip rsync tzdata && \
     pip -q install awscli boto3 PyYAML && \
     echo "Done install AWS" && \
 
     echo "Install CI Helper" && \
+    curl -sSL https://github.com/rande/gitlab-ci-helper/releases/download/${CI_HELPER_VERSION}/alpine-amd64-gitlab-ci-helper -o /usr/bin/ci-helper && \
+    chmod 755 /usr/bin/ci-helper && \
+    echo "Done install CI Helper" && \
+
+    echo "Install Docker Compose" && \
     curl -sSL https://github.com/sgerrand/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/sgerrand.rsa.pub -o /etc/apk/keys/sgerrand.rsa.pub && \
     curl -sSL https://github.com/sgerrand/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/glibc-${GLIBC_VERSION}.apk -O && \
     curl -sSL https://github.com/sgerrand/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/glibc-bin-${GLIBC_VERSION}.apk -O && \
     apk add --update -q glibc-${GLIBC_VERSION}.apk glibc-bin-${GLIBC_VERSION}.apk && \
     rm /etc/apk/keys/sgerrand.rsa.pub glibc-${GLIBC_VERSION}.apk glibc-bin-${GLIBC_VERSION}.apk && \
-    curl -sSL https://github.com/rande/gitlab-ci-helper/releases/download/${CI_HELPER_VERSION}/linux-amd64-gitlab-ci-helper -o /usr/bin/ci-helper && \
-    chmod 755 /usr/bin/ci-helper && \
-    echo "Done install CI Helper" && \
-
-    echo "Install Docker Compose" && \
     curl -sSL https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose && \
     chmod +x /usr/local/bin/docker-compose && \
     docker-compose --version && \

golang/Dockerfile

@@ -1,5 +1,5 @@
 FROM golang:1.8
-MAINTAINER Raphaël Benitte <[email protected]>
+LABEL maintainer="Raphaël Benitte <[email protected]>"
 
 ARG GLIDE_VERSION
 ARG CI_HELPER_VERSION

java/Dockerfile

@@ -1,5 +1,5 @@
 FROM debian:8.7
-MAINTAINER Stephane Leclercq <[email protected]>
+LABEL maintainer="Stephane Leclercq <[email protected]>"
 
 ENV DEBIAN_FRONTEND=noninteractive \
     LANG=C.UTF-8

node/Dockerfile

@@ -1,5 +1,5 @@
 FROM debian:8.7
-MAINTAINER Thomas Rabaix <[email protected]>
+LABEL maintainer="Thomas Rabaix <[email protected]>"
 
 ENV DEBIAN_FRONTEND=noninteractive \
     LANG=C.UTF-8 \

php/5.3/Dockerfile

@@ -1,5 +1,5 @@
 FROM jolicode/phpenv
-MAINTAINER Rémi Marseille <[email protected]>
+LABEL maintainer="Rémi Marseille <[email protected]>"
 
 ARG PHP_VERSION
 ARG CI_HELPER_VERSION

php/Dockerfile.tpl

@@ -1,31 +1,30 @@
 FROM php:{{PHP_VERSION}}
-MAINTAINER Rémi Marseille <marseille@ekino.com>
+LABEL maintainer="Rémi Marseille <marseille@ekino.com>"
 
 ARG APCU_VERSION
 ARG CI_HELPER_VERSION
 ARG COMPOSER_VERSION
-ARG GLIBC_VERSION
 ARG MODD_VERSION
 ARG REDIS_VERSION
 ARG SECURITY_CHECKER_VERSION
 ARG XDEBUG_VERSION
 
+# iconv issue https://github.com/docker-library/php/issues/240
+
 ENV COMPOSER_NO_INTERACTION=1 \
-    TERM=xterm
+    TERM=xterm \
+    LD_PRELOAD="/usr/lib/preloadable_libiconv.so php"
 
 RUN echo "Starting ..." && \
     echo "@edge-community http://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories && \
     echo "@edge-main http://nl.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories && \
-    apk add --update --upgrade alpine-sdk autoconf bash bzip2 curl freetype-dev git icu-dev@edge-main libjpeg-turbo-dev libmcrypt-dev \
-        libpng-dev libxml2-dev make openssh-client php{{PHP_MAJOR_VERSION}}-intl@edge-community postgresql-dev tzdata && \
+    echo "@edge-testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories && \
+    apk add --update --upgrade alpine-sdk autoconf bash bzip2 curl freetype-dev git gnu-libiconv@edge-testing icu-dev@edge-main libjpeg-turbo-dev \
+        libmcrypt-dev libpng-dev libxml2-dev make openssh-client php{{PHP_MAJOR_VERSION}}-intl@edge-community postgresql-dev tzdata && \
     echo "Done base install!" && \
 
     echo "Install CI Helper" && \
-    curl -sSL https://github.com/sgerrand/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/sgerrand.rsa.pub -o /etc/apk/keys/sgerrand.rsa.pub && \
-    curl -sSL https://github.com/sgerrand/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/glibc-${GLIBC_VERSION}.apk -O && \
-    apk add -q glibc-${GLIBC_VERSION}.apk && \
-    rm /etc/apk/keys/sgerrand.rsa.pub glibc-${GLIBC_VERSION}.apk && \
-    curl -sSL https://github.com/rande/gitlab-ci-helper/releases/download/${CI_HELPER_VERSION}/linux-amd64-gitlab-ci-helper -o /usr/bin/ci-helper && \
+    curl -sSL https://github.com/rande/gitlab-ci-helper/releases/download/${CI_HELPER_VERSION}/alpine-amd64-gitlab-ci-helper -o /usr/bin/ci-helper && \
     chmod 755 /usr/bin/ci-helper && \
     echo "Done install CI Helper" && \
 

ruby/Dockerfile

@@ -1,5 +1,5 @@
 FROM ruby:2.5.0-alpine
-MAINTAINER Rémi Marseille <[email protected]>
+LABEL maintainer="Rémi Marseille <[email protected]>"
 
 ARG CI_HELPER_VERSION
 
@@ -8,11 +8,7 @@ RUN echo "Starting ..." && \
     echo "Done base install!" && \
 
     echo "Install CI Helper" && \
-    curl -sSL https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.23-r3/sgerrand.rsa.pub -o /etc/apk/keys/sgerrand.rsa.pub && \
-    curl -sSL https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.23-r3/glibc-2.23-r3.apk -O && \
-    apk add -q glibc-2.23-r3.apk && \
-    rm /etc/apk/keys/sgerrand.rsa.pub glibc-2.23-r3.apk && \
-    curl -sSL https://github.com/rande/gitlab-ci-helper/releases/download/${CI_HELPER_VERSION}/linux-amd64-gitlab-ci-helper -o /usr/bin/ci-helper && \
+    curl -sSL https://github.com/rande/gitlab-ci-helper/releases/download/${CI_HELPER_VERSION}/alpine-amd64-gitlab-ci-helper -o /usr/bin/ci-helper && \
     chmod 755 /usr/bin/ci-helper && \
     echo "Done install CI Helper" && \
 

sonar/Dockerfile

@@ -1,31 +1,33 @@
 FROM alpine:3.4
+LABEL maintainer="Thomas Rabaix <[email protected]>"
 
 ARG SONARSCANNER_VERSION
 
 ENV PATH=/sonar-scanner/bin:/sonar-scanner/jre/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
-ARG SONARSCANNER_VERSION
 ARG CI_HELPER_VERSION
+ARG GLIBC_VERSION
+ARG SONARSCANNER_VERSION
 
 RUN echo "Starting ..." && \
     apk --update upgrade && apk add curl make tzdata unzip && \
     echo "Done base install!" && \
 
     echo "Starting Sonar Scanner" && \
+    curl -sSL https://github.com/sgerrand/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/sgerrand.rsa.pub -o /etc/apk/keys/sgerrand.rsa.pub && \
+    curl -sSL https://github.com/sgerrand/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/glibc-${GLIBC_VERSION}.apk -O && \
+    apk add -q glibc-${GLIBC_VERSION}.apk && \
+    rm /etc/apk/keys/sgerrand.rsa.pub glibc-${GLIBC_VERSION}.apk && \
     curl --insecure -o ./sonarscanner.zip -L https://sonarsource.bintray.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONARSCANNER_VERSION}-linux.zip && \
     unzip sonarscanner.zip && \
     rm sonarscanner.zip && \
     mv sonar-scanner-${SONARSCANNER_VERSION}-linux sonar-scanner && \
     echo "Done Sonar Scanner!" && \
 
     echo "Install CI Helper" && \
-    curl -sSL https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.23-r3/sgerrand.rsa.pub -o /etc/apk/keys/sgerrand.rsa.pub && \
-    curl -sSL https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.23-r3/glibc-2.23-r3.apk -O && \
-    apk add -q glibc-2.23-r3.apk && \
-    rm /etc/apk/keys/sgerrand.rsa.pub glibc-2.23-r3.apk && \
-    curl -sSL https://github.com/rande/gitlab-ci-helper/releases/download/${CI_HELPER_VERSION}/linux-amd64-gitlab-ci-helper -o /usr/bin/ci-helper && \
+    curl -sSL https://github.com/rande/gitlab-ci-helper/releases/download/${CI_HELPER_VERSION}/alpine-amd64-gitlab-ci-helper -o /usr/bin/ci-helper && \
     chmod 755 /usr/bin/ci-helper && \
-    echo "Done install CI Helper"  && \
+    echo "Done install CI Helper" && \
 
     echo "Cleaning files!" && \
     rm -rf /tmp/* /var/cache/apk/* && \