Skip to content

Commit

Permalink
Fix issue with iconv in PHP image
Browse files Browse the repository at this point in the history
  • Loading branch information
mremi committed Jan 26, 2018
1 parent 69f8674 commit 216e733
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ matrix:
- 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=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 ICONV_VERSION=1.15 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 ICONV_VERSION=1.15 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
Expand Down
17 changes: 15 additions & 2 deletions php/Dockerfile.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ ARG APCU_VERSION
ARG CI_HELPER_VERSION
ARG COMPOSER_VERSION
ARG GLIBC_VERSION
ARG ICONV_VERSION
ARG MODD_VERSION
ARG REDIS_VERSION
ARG SECURITY_CHECKER_VERSION
Expand All @@ -17,7 +18,7 @@ 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 && \
libpng-dev libtool libxml2-dev make openssh-client php{{PHP_MAJOR_VERSION}}-intl@edge-community postgresql-dev tzdata && \
echo "Done base install!" && \

echo "Install CI Helper" && \
Expand Down Expand Up @@ -46,6 +47,15 @@ extension=/usr/lib/php{{PHP_MAJOR_VERSION}}/modules/intl.so \n\
zend_extension=opcache.so \n\
" > /usr/local/etc/php/php.ini && \

# iconv issue https://github.com/docker-library/php/issues/240
rm /usr/bin/iconv && \
curl -SL http://ftp.gnu.org/pub/gnu/libiconv/libiconv-${ICONV_VERSION}.tar.gz | tar -xz -C . && \
cd libiconv-${ICONV_VERSION} && \
./configure --prefix=/usr/local && \
make && make install && \
libtool --finish /usr/local/lib && \
cd .. && rm -rf libiconv-${ICONV_VERSION} && \

curl -sSL https://getcomposer.org/download/${COMPOSER_VERSION}/composer.phar -o /usr/local/bin/composer && chmod a+x /usr/local/bin/composer && \
curl -sSL http://get.sensiolabs.org/php-cs-fixer.phar -o /usr/local/bin/php-cs-fixer && chmod a+x /usr/local/bin/php-cs-fixer && \
curl -sSL http://get.sensiolabs.org/security-checker-v${SECURITY_CHECKER_VERSION}.phar -o /usr/local/bin/security-checker && chmod a+x /usr/local/bin/security-checker && \
Expand All @@ -67,7 +77,10 @@ zend_extension=opcache.so \n\
echo "Done AWS!" && \

echo "Cleaning files!" && \
apk del --purge alpine-sdk autoconf && \
apk del --purge alpine-sdk autoconf libtool && \
rm -rf /tmp/* /usr/share/doc /var/cache/apk/* && \

echo "Done!"

# replace origin iconv
ENV LD_PRELOAD /usr/local/lib/preloadable_libiconv.so

0 comments on commit 216e733

Please sign in to comment.