Fix issue with iconv in PHP image

ekino · Jan 29, 2018 · f1609f8 · f1609f8
1 parent 69f8674
commit f1609f8
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@ Versions
 2018-01-DEV
 -----------
 
+* 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

diff --git a/aws/Dockerfile b/aws/Dockerfile
@@ -1,5 +1,5 @@
 FROM alpine:3.4
-MAINTAINER Frank Pavageau <fpavageau@ekino.com>
+LABEL maintainer="Frank Pavageau <fpavageau@ekino.com>"
 
 ARG CI_HELPER_VERSION
 

diff --git a/dind-aws/Dockerfile b/dind-aws/Dockerfile
@@ -1,5 +1,5 @@
 FROM docker:18.01.0-ce-dind
-MAINTAINER Rémi Marseille <marseille@ekino.com>
+LABEL maintainer="Rémi Marseille <marseille@ekino.com>"
 
 ARG CI_HELPER_VERSION
 ARG DOCKER_COMPOSE_VERSION

diff --git a/golang/Dockerfile b/golang/Dockerfile
@@ -1,5 +1,5 @@
 FROM golang:1.8
-MAINTAINER Raphaël Benitte <raphael.benitte@ekino.com>
+LABEL maintainer="Raphaël Benitte <raphael.benitte@ekino.com>"
 
 ARG GLIDE_VERSION
 ARG CI_HELPER_VERSION

diff --git a/java/Dockerfile b/java/Dockerfile
@@ -1,5 +1,5 @@
 FROM debian:8.7
-MAINTAINER Stephane Leclercq <leclercq@ekino.com>
+LABEL maintainer="Stephane Leclercq <leclercq@ekino.com>"
 
 ENV DEBIAN_FRONTEND=noninteractive \
     LANG=C.UTF-8

diff --git a/node/Dockerfile b/node/Dockerfile
@@ -1,5 +1,5 @@
 FROM debian:8.7
-MAINTAINER Thomas Rabaix <rabaix@ekino.com>
+LABEL maintainer="Thomas Rabaix <rabaix@ekino.com>"
 
 ENV DEBIAN_FRONTEND=noninteractive \
     LANG=C.UTF-8 \

diff --git a/php/5.3/Dockerfile b/php/5.3/Dockerfile
@@ -1,5 +1,5 @@
 FROM jolicode/phpenv
-MAINTAINER Rémi Marseille <marseille@ekino.com>
+LABEL maintainer="Rémi Marseille <marseille@ekino.com>"
 
 ARG PHP_VERSION
 ARG CI_HELPER_VERSION

diff --git a/php/Dockerfile.tpl b/php/Dockerfile.tpl
@@ -1,5 +1,5 @@
 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
@@ -10,14 +10,18 @@ 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" && \
@@ -27,6 +31,11 @@ RUN echo "Starting ..." && \
     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 && \
     chmod 755 /usr/bin/ci-helper && \
+    echo -e "#!/bin/sh \n\
+\n\
+LD_PRELOAD= /usr/bin/ci-helper \"\$@\" \n\
+" > /usr/local/bin/ci-helper && \
+    chmod 755 /usr/local/bin/ci-helper && \
     echo "Done install CI Helper" && \
 
     echo "Install Modd" && \

diff --git a/ruby/Dockerfile b/ruby/Dockerfile
@@ -1,5 +1,5 @@
 FROM ruby:2.5.0-alpine
-MAINTAINER Rémi Marseille <marseille@ekino.com>
+LABEL maintainer="Rémi Marseille <marseille@ekino.com>"
 
 ARG CI_HELPER_VERSION