From dc2daccaaa7dec4e99644f0e5b52ea4d0e66f63e Mon Sep 17 00:00:00 2001 From: cytopia Date: Wed, 31 Oct 2018 23:12:46 +0100 Subject: [PATCH 1/6] Fix build pipeline --- Dockerfiles/base/Dockerfile-5.2 | 17 +- Dockerfiles/base/Dockerfile-5.3 | 17 +- Dockerfiles/base/Dockerfile-5.4 | 17 +- Dockerfiles/base/Dockerfile-5.5 | 17 +- Dockerfiles/base/Dockerfile-5.6 | 17 +- Dockerfiles/base/Dockerfile-7.0 | 17 +- Dockerfiles/base/Dockerfile-7.1 | 17 +- Dockerfiles/base/Dockerfile-7.2 | 17 +- Dockerfiles/base/Dockerfile-7.3 | 17 +- Dockerfiles/mods/Dockerfile-5.2 | 142 +++++------- Dockerfiles/mods/Dockerfile-5.3 | 147 +++++------- Dockerfiles/mods/Dockerfile-5.4 | 148 +++++------- Dockerfiles/mods/Dockerfile-5.5 | 152 +++++------- Dockerfiles/mods/Dockerfile-5.6 | 158 +++++-------- Dockerfiles/mods/Dockerfile-7.0 | 156 +++++-------- Dockerfiles/mods/Dockerfile-7.1 | 155 +++++-------- Dockerfiles/mods/Dockerfile-7.2 | 157 +++++-------- Dockerfiles/mods/Dockerfile-7.3 | 159 +++++-------- Dockerfiles/prod/Dockerfile-5.2 | 19 +- Dockerfiles/prod/Dockerfile-5.3 | 19 +- Dockerfiles/prod/Dockerfile-5.4 | 19 +- Dockerfiles/prod/Dockerfile-5.5 | 19 +- Dockerfiles/prod/Dockerfile-5.6 | 19 +- Dockerfiles/prod/Dockerfile-7.0 | 19 +- Dockerfiles/prod/Dockerfile-7.1 | 19 +- Dockerfiles/prod/Dockerfile-7.2 | 19 +- Dockerfiles/prod/Dockerfile-7.3 | 19 +- Dockerfiles/work/Dockerfile-5.2 | 24 +- Dockerfiles/work/Dockerfile-5.3 | 23 +- Dockerfiles/work/Dockerfile-5.4 | 23 +- Dockerfiles/work/Dockerfile-5.5 | 23 +- Dockerfiles/work/Dockerfile-5.6 | 23 +- Dockerfiles/work/Dockerfile-7.0 | 23 +- Dockerfiles/work/Dockerfile-7.1 | 23 +- Dockerfiles/work/Dockerfile-7.2 | 23 +- Dockerfiles/work/Dockerfile-7.3 | 23 +- build/ansible/DOCKERFILES/Dockerfile-base.j2 | 17 +- build/ansible/DOCKERFILES/Dockerfile-mods.j2 | 231 +++++++++++-------- build/ansible/DOCKERFILES/Dockerfile-prod.j2 | 19 +- build/ansible/DOCKERFILES/Dockerfile-work.j2 | 71 +++--- build/ansible/group_vars/all.yml | 77 +++++-- 41 files changed, 1193 insertions(+), 1128 deletions(-) diff --git a/Dockerfiles/base/Dockerfile-5.2 b/Dockerfiles/base/Dockerfile-5.2 index 55e6e595..c86f1811 100644 --- a/Dockerfiles/base/Dockerfile-5.2 +++ b/Dockerfiles/base/Dockerfile-5.2 @@ -36,9 +36,8 @@ RUN set -x \ ### Upgrade (install ps) ### RUN set -x \ - && apt-get update \ - && apt-get upgrade -y \ - && apt-get install --no-install-recommends --no-install-suggests -y procps \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \ && rm -rf /var/lib/apt/lists/* @@ -68,10 +67,20 @@ COPY ./data/docker-entrypoint.d /docker-entrypoint.d ### Verify ### RUN set -x \ + && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^5.2' \ && /usr/local/sbin/php-fpm --test \ + \ && PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \ - && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + && PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + \ + && PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && rm -f /usr/local/etc/php/php.ini ### diff --git a/Dockerfiles/base/Dockerfile-5.3 b/Dockerfiles/base/Dockerfile-5.3 index ff1a990a..e68979a1 100644 --- a/Dockerfiles/base/Dockerfile-5.3 +++ b/Dockerfiles/base/Dockerfile-5.3 @@ -36,9 +36,8 @@ RUN set -x \ ### Upgrade (install ps) ### RUN set -x \ - && apt-get update \ - && apt-get upgrade -y \ - && apt-get install --no-install-recommends --no-install-suggests -y procps \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \ && rm -rf /var/lib/apt/lists/* @@ -68,10 +67,20 @@ COPY ./data/docker-entrypoint.d /docker-entrypoint.d ### Verify ### RUN set -x \ + && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^5.3' \ && /usr/local/sbin/php-fpm --test \ + \ && PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \ - && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + && PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + \ + && PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && rm -f /usr/local/etc/php/php.ini ### diff --git a/Dockerfiles/base/Dockerfile-5.4 b/Dockerfiles/base/Dockerfile-5.4 index 50580958..66cc86a9 100644 --- a/Dockerfiles/base/Dockerfile-5.4 +++ b/Dockerfiles/base/Dockerfile-5.4 @@ -36,9 +36,8 @@ RUN set -x \ ### Upgrade (install ps) ### RUN set -x \ - && apt-get update \ - && apt-get upgrade -y \ - && apt-get install --no-install-recommends --no-install-suggests -y procps \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \ && rm -rf /var/lib/apt/lists/* @@ -68,10 +67,20 @@ COPY ./data/docker-entrypoint.d /docker-entrypoint.d ### Verify ### RUN set -x \ + && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^5.4' \ && /usr/local/sbin/php-fpm --test \ + \ && PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \ - && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + && PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + \ + && PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && rm -f /usr/local/etc/php/php.ini ### diff --git a/Dockerfiles/base/Dockerfile-5.5 b/Dockerfiles/base/Dockerfile-5.5 index 79efd6ef..12a52bec 100644 --- a/Dockerfiles/base/Dockerfile-5.5 +++ b/Dockerfiles/base/Dockerfile-5.5 @@ -36,9 +36,8 @@ RUN set -x \ ### Upgrade (install ps) ### RUN set -x \ - && apt-get update \ - && apt-get upgrade -y \ - && apt-get install --no-install-recommends --no-install-suggests -y procps \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \ && rm -rf /var/lib/apt/lists/* @@ -68,10 +67,20 @@ COPY ./data/docker-entrypoint.d /docker-entrypoint.d ### Verify ### RUN set -x \ + && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^5.5' \ && /usr/local/sbin/php-fpm --test \ + \ && PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \ - && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + && PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + \ + && PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && rm -f /usr/local/etc/php/php.ini ### diff --git a/Dockerfiles/base/Dockerfile-5.6 b/Dockerfiles/base/Dockerfile-5.6 index ef08f801..6dd75690 100644 --- a/Dockerfiles/base/Dockerfile-5.6 +++ b/Dockerfiles/base/Dockerfile-5.6 @@ -36,9 +36,8 @@ RUN set -x \ ### Upgrade (install ps) ### RUN set -x \ - && apt-get update \ - && apt-get upgrade -y \ - && apt-get install --no-install-recommends --no-install-suggests -y procps \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \ && rm -rf /var/lib/apt/lists/* @@ -68,10 +67,20 @@ COPY ./data/docker-entrypoint.d /docker-entrypoint.d ### Verify ### RUN set -x \ + && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^5.6' \ && /usr/local/sbin/php-fpm --test \ + \ && PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \ - && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + && PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + \ + && PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && rm -f /usr/local/etc/php/php.ini ### diff --git a/Dockerfiles/base/Dockerfile-7.0 b/Dockerfiles/base/Dockerfile-7.0 index 9d37c2b7..e659a662 100644 --- a/Dockerfiles/base/Dockerfile-7.0 +++ b/Dockerfiles/base/Dockerfile-7.0 @@ -36,9 +36,8 @@ RUN set -x \ ### Upgrade (install ps) ### RUN set -x \ - && apt-get update \ - && apt-get upgrade -y \ - && apt-get install --no-install-recommends --no-install-suggests -y procps \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \ && rm -rf /var/lib/apt/lists/* @@ -68,10 +67,20 @@ COPY ./data/docker-entrypoint.d /docker-entrypoint.d ### Verify ### RUN set -x \ + && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^7.0' \ && /usr/local/sbin/php-fpm --test \ + \ && PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \ - && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + && PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + \ + && PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && rm -f /usr/local/etc/php/php.ini ### diff --git a/Dockerfiles/base/Dockerfile-7.1 b/Dockerfiles/base/Dockerfile-7.1 index 4e354e50..131247a1 100644 --- a/Dockerfiles/base/Dockerfile-7.1 +++ b/Dockerfiles/base/Dockerfile-7.1 @@ -36,9 +36,8 @@ RUN set -x \ ### Upgrade (install ps) ### RUN set -x \ - && apt-get update \ - && apt-get upgrade -y \ - && apt-get install --no-install-recommends --no-install-suggests -y procps \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \ && rm -rf /var/lib/apt/lists/* @@ -68,10 +67,20 @@ COPY ./data/docker-entrypoint.d /docker-entrypoint.d ### Verify ### RUN set -x \ + && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^7.1' \ && /usr/local/sbin/php-fpm --test \ + \ && PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \ - && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + && PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + \ + && PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && rm -f /usr/local/etc/php/php.ini ### diff --git a/Dockerfiles/base/Dockerfile-7.2 b/Dockerfiles/base/Dockerfile-7.2 index a5aa1b6f..934fc038 100644 --- a/Dockerfiles/base/Dockerfile-7.2 +++ b/Dockerfiles/base/Dockerfile-7.2 @@ -36,9 +36,8 @@ RUN set -x \ ### Upgrade (install ps) ### RUN set -x \ - && apt-get update \ - && apt-get upgrade -y \ - && apt-get install --no-install-recommends --no-install-suggests -y procps \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \ && rm -rf /var/lib/apt/lists/* @@ -68,10 +67,20 @@ COPY ./data/docker-entrypoint.d /docker-entrypoint.d ### Verify ### RUN set -x \ + && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^7.2' \ && /usr/local/sbin/php-fpm --test \ + \ && PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \ - && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + && PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + \ + && PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && rm -f /usr/local/etc/php/php.ini ### diff --git a/Dockerfiles/base/Dockerfile-7.3 b/Dockerfiles/base/Dockerfile-7.3 index 9d2f474b..a502e2e5 100644 --- a/Dockerfiles/base/Dockerfile-7.3 +++ b/Dockerfiles/base/Dockerfile-7.3 @@ -36,9 +36,8 @@ RUN set -x \ ### Upgrade (install ps) ### RUN set -x \ - && apt-get update \ - && apt-get upgrade -y \ - && apt-get install --no-install-recommends --no-install-suggests -y procps \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \ && rm -rf /var/lib/apt/lists/* @@ -68,10 +67,20 @@ COPY ./data/docker-entrypoint.d /docker-entrypoint.d ### Verify ### RUN set -x \ + && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^7.3' \ && /usr/local/sbin/php-fpm --test \ + \ && PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \ - && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + && PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + \ + && PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && rm -f /usr/local/etc/php/php.ini ### diff --git a/Dockerfiles/mods/Dockerfile-5.2 b/Dockerfiles/mods/Dockerfile-5.2 index 37b75739..986a3549 100644 --- a/Dockerfiles/mods/Dockerfile-5.2 +++ b/Dockerfiles/mods/Dockerfile-5.2 @@ -18,85 +18,61 @@ LABEL \ ### Envs ### ENV BUILD_DEPS \ - librabbitmq-dev \ + firebird-dev \ + freetds-dev \ libbz2-dev \ - libcurl4-openssl-dev \ - libxml2-dev \ - libenchant-dev \ - libmagic-dev \ - libssl-dev \ - libpng-dev \ - libjpeg-dev \ - libxpm-dev \ - libvpx-dev \ - zlib1g-dev \ - libfreetype6-dev \ libc-client-dev \ - libkrb5-dev \ libcurl4-openssl-dev \ + libenchant-dev \ libfbclient2 \ + libfreetype6-dev \ libib-util \ - firebird-dev \ libicu-dev \ + libjpeg-dev \ + libkrb5-dev \ libldap2-dev \ - libsasl2-dev \ + libmagic-dev \ libmcrypt-dev \ - zlib1g-dev \ - zlib1g-dev \ libmemcached-dev \ - libssl-dev \ - libsasl2-dev \ - freetds-dev \ - libfbclient2 \ - libib-util \ - firebird-dev \ - zlib1g-dev \ - libpq-dev \ - libsqlite3-dev \ + libpng-dev \ libpq-dev \ - libssl-dev \ libpspell-dev \ + librabbitmq-dev \ librecode-dev \ - libmm-dev \ - libxml2-dev \ - libssl-dev \ + libsasl2-dev \ libsnmp-dev \ - snmp \ - libxml2-dev \ + libssl-dev \ libtidy-dev \ + libvpx-dev \ libxml2-dev \ - libxml2-dev \ - libxml2-dev \ - libxml2-dev \ - libxml2-dev \ + libxpm-dev \ libxslt-dev \ + snmp \ zlib1g-dev \ ca-certificates \ git ENV RUN_DEPS \ - librabbitmq1 \ - libenchant1c2a \ - libpng12-0 \ - libjpeg62-turbo \ - libxpm4 \ - libvpx1 \ - libfreetype6 \ + libaspell15 \ libc-client2007e \ + libenchant1c2a \ libfbclient2 \ + libfreetype6 \ libicu52 \ + libjpeg62-turbo \ libmcrypt4 \ libmemcachedutil2 \ libmysqlclient18 \ - libsybdb5 \ - libfbclient2 \ - libpq5 \ + libpng12-0 \ libpq5 \ - libaspell15 \ + librabbitmq1 \ librecode0 \ - snmp \ + libsybdb5 \ libtidy-0.99-0 \ + libvpx1 \ + libxpm4 \ libxslt1.1 \ + snmp \ ca-certificates @@ -104,8 +80,9 @@ ENV RUN_DEPS \ ### Install ### RUN set -x \ - && apt-get update \ - && apt-get install --no-install-recommends --no-install-suggests -y \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ ${BUILD_DEPS} \ \ \ @@ -124,11 +101,7 @@ RUN set -x \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) bcmath \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) bz2 \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) calendar \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) ctype \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) curl \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) dba \ - && /usr/local/bin/docker-php-ext-configure dom --with-libxml-dir=/usr \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) dom \ && echo "/usr" | pecl install enchant \ && docker-php-ext-enable enchant \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) exif \ @@ -145,9 +118,7 @@ ln -s /usr/include/freetype2/freetype.h /usr/include/freetype2/freetype/freetype && /usr/local/bin/docker-php-ext-configure gd --with-gd --with-jpeg-dir=/usr --with-png-dir=/usr --with-zlib-dir=/usr --with-xpm-dir=/usr --with-freetype-dir=/usr --enable-gd-jis-conv --enable-gd-native-ttf \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gd \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gettext \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) hash \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) iconv \ - && pecl install igbinary \ + && pecl install igbinary-2.0.7 \ && docker-php-ext-enable igbinary \ && ln -s /usr/lib/x86_64-linux-gnu/libkrb5* /usr/lib/ \ && /usr/local/bin/docker-php-ext-configure imap --with-kerberos --with-imap-ssl --with-imap \ @@ -155,11 +126,9 @@ ln -s /usr/include/freetype2/freetype.h /usr/include/freetype2/freetype/freetype && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) interbase \ && pecl install intl \ && docker-php-ext-enable intl \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) json \ && ln -s /usr/lib/x86_64-linux-gnu/libldap* /usr/lib/ \ && /usr/local/bin/docker-php-ext-configure ldap --with-ldap --with-ldap-sasl \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) ldap \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mbstring \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mcrypt \ && pecl install memcache \ && docker-php-ext-enable memcache \ @@ -169,67 +138,43 @@ ln -s /usr/include/freetype2/freetype.h /usr/include/freetype2/freetype/freetype && docker-php-ext-enable mongo \ && pecl install msgpack-0.5.7 \ && docker-php-ext-enable msgpack \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysql \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysqli \ && pecl install zendopcache \ && docker-php-ext-enable opcache \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pcntl \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo \ && ln -s /usr/lib/x86_64-linux-gnu/libsybdb.* /usr/lib/ \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_dblib \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_firebird \ - && /usr/local/bin/docker-php-ext-configure pdo_mysql --with-zlib-dir=/usr \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_mysql \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_pgsql \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_sqlite \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pgsql \ && pecl install phar \ && docker-php-ext-enable phar \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) posix \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pspell \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \ && pecl install redis-2.2.7 \ && docker-php-ext-enable redis \ - && /usr/local/bin/docker-php-ext-configure session --with-mm \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) session \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) shmop \ - && /usr/local/bin/docker-php-ext-configure simplexml --with-libxml-dir=/usr \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) simplexml \ && /usr/local/bin/docker-php-ext-configure snmp --with-openssl-dir \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) snmp \ - && /usr/local/bin/docker-php-ext-configure soap --with-libxml-dir=/usr \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) soap \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sockets \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvmsg \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvsem \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvshm \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) tidy \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) tokenizer \ && pecl install uploadprogress \ && docker-php-ext-enable uploadprogress \ && /usr/local/bin/docker-php-ext-configure wddx --with-libxml-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) wddx \ && pecl install xdebug-2.2.7 \ && docker-php-ext-enable xdebug \ - && /usr/local/bin/docker-php-ext-configure xml --with-libxml-dir=/usr \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xml \ - && /usr/local/bin/docker-php-ext-configure xmlreader --with-libxml-dir=/usr \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xmlreader \ && /usr/local/bin/docker-php-ext-configure xmlrpc --with-libxml-dir=/usr --with-iconv-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xmlrpc \ - && /usr/local/bin/docker-php-ext-configure xmlwriter --with-libxml-dir=/usr \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xmlwriter \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xsl \ && /usr/local/bin/docker-php-ext-configure zip --with-zlib-dir=/usr --with-pcre-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) zip \ \ - \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps \ - ${BUILD_DEPS} \ - \ - \ - && apt-get install --no-install-recommends --no-install-suggests -y \ - ${RUN_DEPS} \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false ${BUILD_DEPS} \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests ${RUN_DEPS} \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ && update-ca-certificates \ && sh -c "find /usr/local -type f -perm /u+x -exec strip --strip-all '{}' + || true" @@ -239,12 +184,21 @@ ln -s /usr/include/freetype2/freetype.h /usr/include/freetype2/freetype/freetype ### Verify ### RUN set -x \ + && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^5.2' \ && /usr/local/sbin/php-fpm --test \ + \ && PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \ - && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi - -RUN set -x \ + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + && PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + \ + && PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && rm -f /usr/local/etc/php/php.ini \ + \ && php -m | grep -oiE '^amqp$' \ && php-fpm -m | grep -oiE '^amqp$' \ && php -m | grep -oiE '^bcmath$' \ @@ -267,6 +221,8 @@ RUN set -x \ && php-fpm -m | grep -oiE '^exif$' \ && php -m | grep -oiE '^fileinfo$' \ && php-fpm -m | grep -oiE '^fileinfo$' \ + && php -m | grep -oiE '^filter$' \ + && php-fpm -m | grep -oiE '^filter$' \ && php -m | grep -oiE '^ftp$' \ && php-fpm -m | grep -oiE '^ftp$' \ && php -m | grep -oiE '^gd$' \ @@ -289,6 +245,8 @@ RUN set -x \ && php-fpm -m | grep -oiE '^json$' \ && php -m | grep -oiE '^ldap$' \ && php-fpm -m | grep -oiE '^ldap$' \ + && php -m | grep -oiE '^libxml$' \ + && php-fpm -m | grep -oiE '^libxml$' \ && php -m | grep -oiE '^mbstring$' \ && php-fpm -m | grep -oiE '^mbstring$' \ && php -m | grep -oiE '^mcrypt$' \ @@ -307,8 +265,12 @@ RUN set -x \ && php-fpm -m | grep -oiE '^mysqli$' \ && php -m | grep -oiE '^Zend Opcache$' \ && php-fpm -m | grep -oiE '^Zend Opcache$' \ + && php -m | grep -oiE '^openssl$' \ + && php-fpm -m | grep -oiE '^openssl$' \ && php -m | grep -oiE '^pcntl$' \ && php-fpm -m | grep -oiE '^pcntl$' \ + && php -m | grep -oiE '^pcre$' \ + && php-fpm -m | grep -oiE '^pcre$' \ && php -m | grep -oiE '^pdo$' \ && php-fpm -m | grep -oiE '^pdo$' \ && php -m | grep -oiE '^pdo_dblib$' \ @@ -329,6 +291,8 @@ RUN set -x \ && php-fpm -m | grep -oiE '^posix$' \ && php -m | grep -oiE '^pspell$' \ && php-fpm -m | grep -oiE '^pspell$' \ + && php -m | grep -oiE '^readline$' \ + && php-fpm -m | grep -oiE '^readline$' \ && php -m | grep -oiE '^recode$' \ && php-fpm -m | grep -oiE '^recode$' \ && php -m | grep -oiE '^redis$' \ diff --git a/Dockerfiles/mods/Dockerfile-5.3 b/Dockerfiles/mods/Dockerfile-5.3 index 4de0b522..62d9bf2f 100644 --- a/Dockerfiles/mods/Dockerfile-5.3 +++ b/Dockerfiles/mods/Dockerfile-5.3 @@ -18,94 +18,66 @@ LABEL \ ### Envs ### ENV BUILD_DEPS \ - librabbitmq-dev \ + firebird-dev \ + freetds-dev \ libbz2-dev \ + libc-client-dev \ libcurl4-openssl-dev \ - libxml2-dev \ libenchant-dev \ - libssl-dev \ - libpng-dev \ - libjpeg-dev \ - libxpm-dev \ - libvpx-dev \ - zlib1g-dev \ + libfbclient2 \ libfreetype6-dev \ libgmp-dev \ - libmagickwand-dev \ - libc-client-dev \ - libkrb5-dev \ - libcurl4-openssl-dev \ - libfbclient2 \ libib-util \ - firebird-dev \ libicu-dev \ + libjpeg-dev \ + libkrb5-dev \ libldap2-dev \ - libsasl2-dev \ + libmagickwand-dev \ libmcrypt-dev \ - zlib1g-dev \ - zlib1g-dev \ libmemcached-dev \ - libssl-dev \ - libsasl2-dev \ - libssl-dev \ - libsasl2-dev \ - freetds-dev \ - libfbclient2 \ - libib-util \ - firebird-dev \ - zlib1g-dev \ - libpq-dev \ - libsqlite3-dev \ + libnghttp2-dev \ + libpng-dev \ libpq-dev \ - libssl-dev \ libpspell-dev \ - librecode-dev \ + librabbitmq-dev \ librdkafka-dev \ - libmm-dev \ - libxml2-dev \ - libssl-dev \ + libsasl2-dev \ libsnmp-dev \ - snmp \ - libxml2-dev \ - libnghttp2-dev \ libssl-dev \ libtidy-dev \ + libvpx-dev \ libxml2-dev \ - libxml2-dev \ - libxml2-dev \ - libxml2-dev \ - libxml2-dev \ + libxpm-dev \ libxslt-dev \ + snmp \ zlib1g-dev \ ca-certificates \ git ENV RUN_DEPS \ - librabbitmq1 \ - libenchant1c2a \ - libpng12-0 \ - libjpeg62-turbo \ - libxpm4 \ - libvpx1 \ - libfreetype6 \ - libmagickwand-6.q16-2 \ + libaspell15 \ libc-client2007e \ + libenchant1c2a \ libfbclient2 \ + libfreetype6 \ libicu52 \ + libjpeg62-turbo \ + libmagickwand-6.q16-2 \ libmcrypt4 \ libmemcachedutil2 \ libmysqlclient18 \ - libsybdb5 \ - libfbclient2 \ - libpq5 \ + libnghttp2-5 \ + libpng12-0 \ libpq5 \ - libaspell15 \ - librecode0 \ + librabbitmq1 \ librdkafka1 \ - snmp \ - libnghttp2-5 \ + librecode0 \ + libsybdb5 \ libtidy-0.99-0 \ + libvpx1 \ + libxpm4 \ libxslt1.1 \ + snmp \ ca-certificates @@ -113,8 +85,9 @@ ENV RUN_DEPS \ ### Install ### RUN set -x \ - && apt-get update \ - && apt-get install --no-install-recommends --no-install-suggests -y \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ ${BUILD_DEPS} \ \ \ @@ -135,14 +108,9 @@ RUN set -x \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) bcmath \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) bz2 \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) calendar \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) ctype \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) curl \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) dba \ - && /usr/local/bin/docker-php-ext-configure dom --with-libxml-dir=/usr \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) dom \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) enchant \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) exif \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) fileinfo \ && /usr/local/bin/docker-php-ext-configure ftp --with-openssl-dir \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) ftp \ && ln -s /usr/lib/x86_64-linux-gnu/libXpm.* /usr/lib/ && mkdir /usr/include/freetype2/freetype && ln -s /usr/include/freetype2/freetype.h /usr/include/freetype2/freetype/freetype.h \ @@ -151,8 +119,6 @@ RUN set -x \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gettext \ && ln /usr/include/x86_64-linux-gnu/gmp.h /usr/include/ \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gmp \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) hash \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) iconv \ && pecl install igbinary \ && docker-php-ext-enable igbinary \ && pecl install imagick-3.3.0 \ @@ -162,7 +128,6 @@ RUN set -x \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) imap \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) interbase \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) intl \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) json \ && ln -s /usr/lib/x86_64-linux-gnu/libldap* /usr/lib/ \ && /usr/local/bin/docker-php-ext-configure ldap --with-ldap --with-ldap-sasl \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) ldap \ @@ -178,19 +143,16 @@ RUN set -x \ && docker-php-ext-enable mongodb \ && pecl install msgpack-0.5.7 \ && docker-php-ext-enable msgpack \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysql \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysqli \ && pecl install zendopcache \ && docker-php-ext-enable opcache \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pcntl \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo \ && ln -s /usr/lib/x86_64-linux-gnu/libsybdb.* /usr/lib/ \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_dblib \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_firebird \ && /usr/local/bin/docker-php-ext-configure pdo_mysql --with-zlib-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_mysql \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_pgsql \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_sqlite \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pgsql \ && git clone -v https://github.com/phalcon/cphalcon /tmp/phalcon \ && cd /tmp/phalcon \ @@ -198,19 +160,12 @@ RUN set -x \ && cd build && ./install \ && docker-php-ext-enable phalcon \ && cd / && rm -rf /tmp/phalcon \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) phar \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) posix \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pspell \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \ && pecl install redis \ && docker-php-ext-enable redis \ && pecl install rdkafka \ && docker-php-ext-enable rdkafka \ - && /usr/local/bin/docker-php-ext-configure session --with-mm \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) session \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) shmop \ - && /usr/local/bin/docker-php-ext-configure simplexml --with-libxml-dir=/usr \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) simplexml \ && /usr/local/bin/docker-php-ext-configure snmp --with-openssl-dir \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) snmp \ && /usr/local/bin/docker-php-ext-configure soap --with-libxml-dir=/usr \ @@ -222,32 +177,21 @@ RUN set -x \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvsem \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvshm \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) tidy \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) tokenizer \ && pecl install uploadprogress \ && docker-php-ext-enable uploadprogress \ && /usr/local/bin/docker-php-ext-configure wddx --with-libxml-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) wddx \ && pecl install xdebug-2.2.7 \ && docker-php-ext-enable xdebug \ - && /usr/local/bin/docker-php-ext-configure xml --with-libxml-dir=/usr \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xml \ - && /usr/local/bin/docker-php-ext-configure xmlreader --with-libxml-dir=/usr \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xmlreader \ && /usr/local/bin/docker-php-ext-configure xmlrpc --with-libxml-dir=/usr --with-iconv-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xmlrpc \ - && /usr/local/bin/docker-php-ext-configure xmlwriter --with-libxml-dir=/usr \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xmlwriter \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xsl \ && /usr/local/bin/docker-php-ext-configure zip --with-zlib-dir=/usr --with-pcre-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) zip \ \ - \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps \ - ${BUILD_DEPS} \ - \ - \ - && apt-get install --no-install-recommends --no-install-suggests -y \ - ${RUN_DEPS} \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false ${BUILD_DEPS} \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests ${RUN_DEPS} \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ && update-ca-certificates \ && sh -c "find /usr/local -type f -perm /u+x -exec strip --strip-all '{}' + || true" @@ -257,12 +201,21 @@ RUN set -x \ ### Verify ### RUN set -x \ + && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^5.3' \ && /usr/local/sbin/php-fpm --test \ + \ && PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \ - && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi - -RUN set -x \ + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + && PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + \ + && PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && rm -f /usr/local/etc/php/php.ini \ + \ && php -m | grep -oiE '^amqp$' \ && php-fpm -m | grep -oiE '^amqp$' \ && php -m | grep -oiE '^apcu$' \ @@ -287,6 +240,8 @@ RUN set -x \ && php-fpm -m | grep -oiE '^exif$' \ && php -m | grep -oiE '^fileinfo$' \ && php-fpm -m | grep -oiE '^fileinfo$' \ + && php -m | grep -oiE '^filter$' \ + && php-fpm -m | grep -oiE '^filter$' \ && php -m | grep -oiE '^ftp$' \ && php-fpm -m | grep -oiE '^ftp$' \ && php -m | grep -oiE '^gd$' \ @@ -313,6 +268,8 @@ RUN set -x \ && php-fpm -m | grep -oiE '^json$' \ && php -m | grep -oiE '^ldap$' \ && php-fpm -m | grep -oiE '^ldap$' \ + && php -m | grep -oiE '^libxml$' \ + && php-fpm -m | grep -oiE '^libxml$' \ && php -m | grep -oiE '^mbstring$' \ && php-fpm -m | grep -oiE '^mbstring$' \ && php -m | grep -oiE '^mcrypt$' \ @@ -331,10 +288,16 @@ RUN set -x \ && php-fpm -m | grep -oiE '^mysql$' \ && php -m | grep -oiE '^mysqli$' \ && php-fpm -m | grep -oiE '^mysqli$' \ + && php -m | grep -oiE '^mysqlnd$' \ + && php-fpm -m | grep -oiE '^mysqlnd$' \ && php -m | grep -oiE '^Zend Opcache$' \ && php-fpm -m | grep -oiE '^Zend Opcache$' \ + && php -m | grep -oiE '^openssl$' \ + && php-fpm -m | grep -oiE '^openssl$' \ && php -m | grep -oiE '^pcntl$' \ && php-fpm -m | grep -oiE '^pcntl$' \ + && php -m | grep -oiE '^pcre$' \ + && php-fpm -m | grep -oiE '^pcre$' \ && php -m | grep -oiE '^pdo$' \ && php-fpm -m | grep -oiE '^pdo$' \ && php -m | grep -oiE '^pdo_dblib$' \ diff --git a/Dockerfiles/mods/Dockerfile-5.4 b/Dockerfiles/mods/Dockerfile-5.4 index bc0f7c7c..7caf12f6 100644 --- a/Dockerfiles/mods/Dockerfile-5.4 +++ b/Dockerfiles/mods/Dockerfile-5.4 @@ -18,94 +18,66 @@ LABEL \ ### Envs ### ENV BUILD_DEPS \ - librabbitmq-dev \ + firebird-dev \ + freetds-dev \ libbz2-dev \ + libc-client-dev \ libcurl4-openssl-dev \ - libxml2-dev \ libenchant-dev \ - libssl-dev \ - libpng-dev \ - libjpeg-dev \ - libxpm-dev \ - libvpx-dev \ - zlib1g-dev \ + libfbclient2 \ libfreetype6-dev \ libgmp-dev \ - libmagickwand-dev \ - libc-client-dev \ - libkrb5-dev \ - libcurl4-openssl-dev \ - libfbclient2 \ libib-util \ - firebird-dev \ libicu-dev \ + libjpeg-dev \ + libkrb5-dev \ libldap2-dev \ - libsasl2-dev \ + libmagickwand-dev \ libmcrypt-dev \ - zlib1g-dev \ - zlib1g-dev \ libmemcached-dev \ - libssl-dev \ - libsasl2-dev \ - libssl-dev \ - libsasl2-dev \ - freetds-dev \ - libfbclient2 \ - libib-util \ - firebird-dev \ - zlib1g-dev \ - libpq-dev \ - libsqlite3-dev \ + libnghttp2-dev \ + libpng-dev \ libpq-dev \ - libssl-dev \ libpspell-dev \ - librecode-dev \ + librabbitmq-dev \ librdkafka-dev \ - libmm-dev \ - libxml2-dev \ - libssl-dev \ + libsasl2-dev \ libsnmp-dev \ - snmp \ - libxml2-dev \ - libnghttp2-dev \ libssl-dev \ libtidy-dev \ + libvpx-dev \ libxml2-dev \ - libxml2-dev \ - libxml2-dev \ - libxml2-dev \ - libxml2-dev \ + libxpm-dev \ libxslt-dev \ + snmp \ zlib1g-dev \ ca-certificates \ git ENV RUN_DEPS \ - librabbitmq1 \ - libenchant1c2a \ - libpng12-0 \ - libjpeg62-turbo \ - libxpm4 \ - libvpx1 \ - libfreetype6 \ - libmagickwand-6.q16-2 \ + libaspell15 \ libc-client2007e \ + libenchant1c2a \ libfbclient2 \ + libfreetype6 \ libicu52 \ + libjpeg62-turbo \ + libmagickwand-6.q16-2 \ libmcrypt4 \ libmemcachedutil2 \ libmysqlclient18 \ - libsybdb5 \ - libfbclient2 \ - libpq5 \ + libnghttp2-5 \ + libpng12-0 \ libpq5 \ - libaspell15 \ - librecode0 \ + librabbitmq1 \ librdkafka1 \ - snmp \ - libnghttp2-5 \ + librecode0 \ + libsybdb5 \ libtidy-0.99-0 \ + libvpx1 \ + libxpm4 \ libxslt1.1 \ + snmp \ ca-certificates @@ -113,8 +85,9 @@ ENV RUN_DEPS \ ### Install ### RUN set -x \ - && apt-get update \ - && apt-get install --no-install-recommends --no-install-suggests -y \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ ${BUILD_DEPS} \ \ \ @@ -135,14 +108,9 @@ RUN set -x \ && /usr/local/bin/docker-php-ext-install bcmath \ && /usr/local/bin/docker-php-ext-install bz2 \ && /usr/local/bin/docker-php-ext-install calendar \ - && /usr/local/bin/docker-php-ext-install ctype \ - && /usr/local/bin/docker-php-ext-install curl \ && /usr/local/bin/docker-php-ext-install dba \ - && /usr/local/bin/docker-php-ext-configure dom --with-libxml-dir=/usr \ - && /usr/local/bin/docker-php-ext-install dom \ && /usr/local/bin/docker-php-ext-install enchant \ && /usr/local/bin/docker-php-ext-install exif \ - && /usr/local/bin/docker-php-ext-install fileinfo \ && /usr/local/bin/docker-php-ext-configure ftp --with-openssl-dir \ && /usr/local/bin/docker-php-ext-install ftp \ && ln -s /usr/lib/x86_64-linux-gnu/libXpm.* /usr/lib/ \ @@ -151,8 +119,6 @@ RUN set -x \ && /usr/local/bin/docker-php-ext-install gettext \ && ln /usr/include/x86_64-linux-gnu/gmp.h /usr/include/ \ && /usr/local/bin/docker-php-ext-install gmp \ - && /usr/local/bin/docker-php-ext-install hash \ - && /usr/local/bin/docker-php-ext-install iconv \ && pecl install igbinary \ && docker-php-ext-enable igbinary \ && pecl install imagick \ @@ -162,7 +128,6 @@ RUN set -x \ && /usr/local/bin/docker-php-ext-install imap \ && /usr/local/bin/docker-php-ext-install interbase \ && /usr/local/bin/docker-php-ext-install intl \ - && /usr/local/bin/docker-php-ext-install json \ && ln -s /usr/lib/x86_64-linux-gnu/libldap* /usr/lib/ \ && /usr/local/bin/docker-php-ext-configure ldap --with-ldap --with-ldap-sasl \ && /usr/local/bin/docker-php-ext-install ldap \ @@ -183,14 +148,12 @@ RUN set -x \ && pecl install zendopcache \ && docker-php-ext-enable opcache \ && /usr/local/bin/docker-php-ext-install pcntl \ - && /usr/local/bin/docker-php-ext-install pdo \ && ln -s /usr/lib/x86_64-linux-gnu/libsybdb.* /usr/lib/ \ && /usr/local/bin/docker-php-ext-install pdo_dblib \ && /usr/local/bin/docker-php-ext-install pdo_firebird \ && /usr/local/bin/docker-php-ext-configure pdo_mysql --with-zlib-dir=/usr \ && /usr/local/bin/docker-php-ext-install pdo_mysql \ && /usr/local/bin/docker-php-ext-install pdo_pgsql \ - && /usr/local/bin/docker-php-ext-install pdo_sqlite \ && /usr/local/bin/docker-php-ext-install pgsql \ && git clone -v https://github.com/phalcon/cphalcon /tmp/phalcon \ && cd /tmp/phalcon \ @@ -198,19 +161,12 @@ RUN set -x \ && cd build && ./install \ && docker-php-ext-enable phalcon \ && cd / && rm -rf /tmp/phalcon \ - && /usr/local/bin/docker-php-ext-install phar \ - && /usr/local/bin/docker-php-ext-install posix \ && /usr/local/bin/docker-php-ext-install pspell \ - && /usr/local/bin/docker-php-ext-install recode \ && pecl install redis \ && docker-php-ext-enable redis \ && pecl install rdkafka \ && docker-php-ext-enable rdkafka \ - && /usr/local/bin/docker-php-ext-configure session --with-mm \ - && /usr/local/bin/docker-php-ext-install session \ && /usr/local/bin/docker-php-ext-install shmop \ - && /usr/local/bin/docker-php-ext-configure simplexml --with-libxml-dir=/usr \ - && /usr/local/bin/docker-php-ext-install simplexml \ && /usr/local/bin/docker-php-ext-configure snmp --with-openssl-dir \ && /usr/local/bin/docker-php-ext-install snmp \ && /usr/local/bin/docker-php-ext-configure soap --with-libxml-dir=/usr \ @@ -222,32 +178,21 @@ RUN set -x \ && /usr/local/bin/docker-php-ext-install sysvsem \ && /usr/local/bin/docker-php-ext-install sysvshm \ && /usr/local/bin/docker-php-ext-install tidy \ - && /usr/local/bin/docker-php-ext-install tokenizer \ && pecl install uploadprogress \ && docker-php-ext-enable uploadprogress \ && /usr/local/bin/docker-php-ext-configure wddx --with-libxml-dir=/usr \ && /usr/local/bin/docker-php-ext-install wddx \ && pecl install xdebug-2.4.1 \ && docker-php-ext-enable xdebug \ - && /usr/local/bin/docker-php-ext-configure xml --with-libxml-dir=/usr \ - && /usr/local/bin/docker-php-ext-install xml \ - && /usr/local/bin/docker-php-ext-configure xmlreader --with-libxml-dir=/usr \ - && /usr/local/bin/docker-php-ext-install xmlreader \ && /usr/local/bin/docker-php-ext-configure xmlrpc --with-libxml-dir=/usr --with-iconv-dir=/usr \ && /usr/local/bin/docker-php-ext-install xmlrpc \ - && /usr/local/bin/docker-php-ext-configure xmlwriter --with-libxml-dir=/usr \ - && /usr/local/bin/docker-php-ext-install xmlwriter \ && /usr/local/bin/docker-php-ext-install xsl \ && /usr/local/bin/docker-php-ext-configure zip --with-zlib-dir=/usr --with-pcre-dir=/usr \ && /usr/local/bin/docker-php-ext-install zip \ \ - \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps \ - ${BUILD_DEPS} \ - \ - \ - && apt-get install --no-install-recommends --no-install-suggests -y \ - ${RUN_DEPS} \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false ${BUILD_DEPS} \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests ${RUN_DEPS} \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ && update-ca-certificates \ && sh -c "find /usr/local -type f -perm /u+x -exec strip --strip-all '{}' + || true" @@ -257,12 +202,21 @@ RUN set -x \ ### Verify ### RUN set -x \ + && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^5.4' \ && /usr/local/sbin/php-fpm --test \ + \ && PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \ - && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi - -RUN set -x \ + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + && PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + \ + && PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && rm -f /usr/local/etc/php/php.ini \ + \ && php -m | grep -oiE '^amqp$' \ && php-fpm -m | grep -oiE '^amqp$' \ && php -m | grep -oiE '^apcu$' \ @@ -287,6 +241,8 @@ RUN set -x \ && php-fpm -m | grep -oiE '^exif$' \ && php -m | grep -oiE '^fileinfo$' \ && php-fpm -m | grep -oiE '^fileinfo$' \ + && php -m | grep -oiE '^filter$' \ + && php-fpm -m | grep -oiE '^filter$' \ && php -m | grep -oiE '^ftp$' \ && php-fpm -m | grep -oiE '^ftp$' \ && php -m | grep -oiE '^gd$' \ @@ -313,6 +269,8 @@ RUN set -x \ && php-fpm -m | grep -oiE '^json$' \ && php -m | grep -oiE '^ldap$' \ && php-fpm -m | grep -oiE '^ldap$' \ + && php -m | grep -oiE '^libxml$' \ + && php-fpm -m | grep -oiE '^libxml$' \ && php -m | grep -oiE '^mbstring$' \ && php-fpm -m | grep -oiE '^mbstring$' \ && php -m | grep -oiE '^mcrypt$' \ @@ -331,10 +289,16 @@ RUN set -x \ && php-fpm -m | grep -oiE '^mysql$' \ && php -m | grep -oiE '^mysqli$' \ && php-fpm -m | grep -oiE '^mysqli$' \ + && php -m | grep -oiE '^mysqlnd$' \ + && php-fpm -m | grep -oiE '^mysqlnd$' \ && php -m | grep -oiE '^Zend Opcache$' \ && php-fpm -m | grep -oiE '^Zend Opcache$' \ + && php -m | grep -oiE '^openssl$' \ + && php-fpm -m | grep -oiE '^openssl$' \ && php -m | grep -oiE '^pcntl$' \ && php-fpm -m | grep -oiE '^pcntl$' \ + && php -m | grep -oiE '^pcre$' \ + && php-fpm -m | grep -oiE '^pcre$' \ && php -m | grep -oiE '^pdo$' \ && php-fpm -m | grep -oiE '^pdo$' \ && php -m | grep -oiE '^pdo_dblib$' \ @@ -357,6 +321,8 @@ RUN set -x \ && php-fpm -m | grep -oiE '^posix$' \ && php -m | grep -oiE '^pspell$' \ && php-fpm -m | grep -oiE '^pspell$' \ + && php -m | grep -oiE '^readline$' \ + && php-fpm -m | grep -oiE '^readline$' \ && php -m | grep -oiE '^recode$' \ && php-fpm -m | grep -oiE '^recode$' \ && php -m | grep -oiE '^redis$' \ diff --git a/Dockerfiles/mods/Dockerfile-5.5 b/Dockerfiles/mods/Dockerfile-5.5 index 5405f085..8b359354 100644 --- a/Dockerfiles/mods/Dockerfile-5.5 +++ b/Dockerfiles/mods/Dockerfile-5.5 @@ -18,96 +18,67 @@ LABEL \ ### Envs ### ENV BUILD_DEPS \ - librabbitmq-dev \ + firebird-dev \ + freetds-dev \ libbz2-dev \ + libc-client-dev \ libcurl4-openssl-dev \ - libxml2-dev \ libenchant-dev \ - libssl-dev \ - libpng-dev \ - libjpeg-dev \ - libxpm-dev \ - libvpx-dev \ - zlib1g-dev \ + libfbclient2 \ libfreetype6-dev \ libgmp-dev \ - libmagickwand-dev \ - libc-client-dev \ - libkrb5-dev \ - libcurl4-openssl-dev \ - libfbclient2 \ libib-util \ - firebird-dev \ libicu-dev \ + libjpeg-dev \ + libkrb5-dev \ libldap2-dev \ - libsasl2-dev \ + libmagickwand-dev \ libmcrypt-dev \ - zlib1g-dev \ - zlib1g-dev \ libmemcached-dev \ - libssl-dev \ - libsasl2-dev \ - libssl-dev \ - libsasl2-dev \ - freetds-dev \ - libfbclient2 \ - libib-util \ - firebird-dev \ - zlib1g-dev \ - libpq-dev \ - libsqlite3-dev \ + libnghttp2-dev \ + libpng-dev \ libpq-dev \ - libssl-dev \ libpspell-dev \ - libedit-dev \ - libreadline-dev \ - librecode-dev \ + librabbitmq-dev \ librdkafka-dev \ - libmm-dev \ - libxml2-dev \ - libssl-dev \ + librecode-dev \ + libsasl2-dev \ libsnmp-dev \ - snmp \ - libxml2-dev \ - libnghttp2-dev \ libssl-dev \ libtidy-dev \ + libvpx-dev \ libxml2-dev \ - libxml2-dev \ - libxml2-dev \ - libxml2-dev \ - libxml2-dev \ + libxpm-dev \ libxslt-dev \ + snmp \ zlib1g-dev \ ca-certificates \ git ENV RUN_DEPS \ - librabbitmq1 \ - libenchant1c2a \ - libpng12-0 \ - libjpeg62-turbo \ - libxpm4 \ - libvpx1 \ - libfreetype6 \ - libmagickwand-6.q16-2 \ + libaspell15 \ libc-client2007e \ + libenchant1c2a \ libfbclient2 \ + libfreetype6 \ libicu52 \ + libjpeg62-turbo \ + libmagickwand-6.q16-2 \ libmcrypt4 \ libmemcachedutil2 \ libmysqlclient18 \ - libsybdb5 \ - libfbclient2 \ - libpq5 \ + libnghttp2-5 \ + libpng12-0 \ libpq5 \ - libaspell15 \ - librecode0 \ + librabbitmq1 \ librdkafka1 \ - snmp \ - libnghttp2-5 \ + librecode0 \ + libsybdb5 \ libtidy-0.99-0 \ + libvpx1 \ + libxpm4 \ libxslt1.1 \ + snmp \ ca-certificates @@ -115,8 +86,9 @@ ENV RUN_DEPS \ ### Install ### RUN set -x \ - && apt-get update \ - && apt-get install --no-install-recommends --no-install-suggests -y \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ ${BUILD_DEPS} \ \ \ @@ -137,24 +109,15 @@ RUN set -x \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) bcmath \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) bz2 \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) calendar \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) ctype \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) curl \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) dba \ - && /usr/local/bin/docker-php-ext-configure dom --with-libxml-dir=/usr \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) dom \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) enchant \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) exif \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) fileinfo \ - && /usr/local/bin/docker-php-ext-configure ftp --with-openssl-dir \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) ftp \ && ln -s /usr/lib/x86_64-linux-gnu/libXpm.* /usr/lib/ \ && /usr/local/bin/docker-php-ext-configure gd --with-gd --with-vpx-dir=/usr --with-jpeg-dir=/usr --with-png-dir=/usr --with-zlib-dir=/usr --with-xpm-dir=/usr --with-freetype-dir=/usr --enable-gd-jis-conv --enable-gd-native-ttf \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gd \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gettext \ && ln /usr/include/x86_64-linux-gnu/gmp.h /usr/include/ \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gmp \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) hash \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) iconv \ && pecl install igbinary \ && docker-php-ext-enable igbinary \ && pecl install imagick \ @@ -164,11 +127,9 @@ RUN set -x \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) imap \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) interbase \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) intl \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) json \ && ln -s /usr/lib/x86_64-linux-gnu/libldap* /usr/lib/ \ && /usr/local/bin/docker-php-ext-configure ldap --with-ldap --with-ldap-sasl \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) ldap \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mbstring \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mcrypt \ && pecl install memcache \ && docker-php-ext-enable memcache \ @@ -184,14 +145,12 @@ RUN set -x \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysqli \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) opcache \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pcntl \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo \ && ln -s /usr/lib/x86_64-linux-gnu/libsybdb.* /usr/lib/ \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_dblib \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_firebird \ && /usr/local/bin/docker-php-ext-configure pdo_mysql --with-zlib-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_mysql \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_pgsql \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_sqlite \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pgsql \ && git clone -v https://github.com/phalcon/cphalcon /tmp/phalcon \ && cd /tmp/phalcon \ @@ -199,20 +158,13 @@ RUN set -x \ && cd build && ./install \ && docker-php-ext-enable phalcon \ && cd / && rm -rf /tmp/phalcon \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) phar \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) posix \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pspell \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) readline \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \ && pecl install redis \ && docker-php-ext-enable redis \ && pecl install rdkafka \ && docker-php-ext-enable rdkafka \ - && /usr/local/bin/docker-php-ext-configure session --with-mm \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) session \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) shmop \ - && /usr/local/bin/docker-php-ext-configure simplexml --with-libxml-dir=/usr \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) simplexml \ && /usr/local/bin/docker-php-ext-configure snmp --with-openssl-dir \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) snmp \ && /usr/local/bin/docker-php-ext-configure soap --with-libxml-dir=/usr \ @@ -224,32 +176,21 @@ RUN set -x \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvsem \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvshm \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) tidy \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) tokenizer \ && pecl install uploadprogress \ && docker-php-ext-enable uploadprogress \ && /usr/local/bin/docker-php-ext-configure wddx --with-libxml-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) wddx \ && pecl install xdebug-2.4.1 \ && docker-php-ext-enable xdebug \ - && /usr/local/bin/docker-php-ext-configure xml --with-libxml-dir=/usr \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xml \ - && /usr/local/bin/docker-php-ext-configure xmlreader --with-libxml-dir=/usr \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xmlreader \ && /usr/local/bin/docker-php-ext-configure xmlrpc --with-libxml-dir=/usr --with-iconv-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xmlrpc \ - && /usr/local/bin/docker-php-ext-configure xmlwriter --with-libxml-dir=/usr \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xmlwriter \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xsl \ && /usr/local/bin/docker-php-ext-configure zip --with-zlib-dir=/usr --with-pcre-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) zip \ \ - \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps \ - ${BUILD_DEPS} \ - \ - \ - && apt-get install --no-install-recommends --no-install-suggests -y \ - ${RUN_DEPS} \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false ${BUILD_DEPS} \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests ${RUN_DEPS} \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ && update-ca-certificates \ && sh -c "find /usr/local -type f -perm /u+x -exec strip --strip-all '{}' + || true" @@ -259,12 +200,21 @@ RUN set -x \ ### Verify ### RUN set -x \ + && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^5.5' \ && /usr/local/sbin/php-fpm --test \ + \ && PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \ - && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi - -RUN set -x \ + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + && PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + \ + && PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && rm -f /usr/local/etc/php/php.ini \ + \ && php -m | grep -oiE '^amqp$' \ && php-fpm -m | grep -oiE '^amqp$' \ && php -m | grep -oiE '^apcu$' \ @@ -289,6 +239,8 @@ RUN set -x \ && php-fpm -m | grep -oiE '^exif$' \ && php -m | grep -oiE '^fileinfo$' \ && php-fpm -m | grep -oiE '^fileinfo$' \ + && php -m | grep -oiE '^filter$' \ + && php-fpm -m | grep -oiE '^filter$' \ && php -m | grep -oiE '^ftp$' \ && php-fpm -m | grep -oiE '^ftp$' \ && php -m | grep -oiE '^gd$' \ @@ -315,6 +267,8 @@ RUN set -x \ && php-fpm -m | grep -oiE '^json$' \ && php -m | grep -oiE '^ldap$' \ && php-fpm -m | grep -oiE '^ldap$' \ + && php -m | grep -oiE '^libxml$' \ + && php-fpm -m | grep -oiE '^libxml$' \ && php -m | grep -oiE '^mbstring$' \ && php-fpm -m | grep -oiE '^mbstring$' \ && php -m | grep -oiE '^mcrypt$' \ @@ -333,10 +287,16 @@ RUN set -x \ && php-fpm -m | grep -oiE '^mysql$' \ && php -m | grep -oiE '^mysqli$' \ && php-fpm -m | grep -oiE '^mysqli$' \ + && php -m | grep -oiE '^mysqlnd$' \ + && php-fpm -m | grep -oiE '^mysqlnd$' \ && php -m | grep -oiE '^Zend Opcache$' \ && php-fpm -m | grep -oiE '^Zend Opcache$' \ + && php -m | grep -oiE '^openssl$' \ + && php-fpm -m | grep -oiE '^openssl$' \ && php -m | grep -oiE '^pcntl$' \ && php-fpm -m | grep -oiE '^pcntl$' \ + && php -m | grep -oiE '^pcre$' \ + && php-fpm -m | grep -oiE '^pcre$' \ && php -m | grep -oiE '^pdo$' \ && php-fpm -m | grep -oiE '^pdo$' \ && php -m | grep -oiE '^pdo_dblib$' \ diff --git a/Dockerfiles/mods/Dockerfile-5.6 b/Dockerfiles/mods/Dockerfile-5.6 index 188017aa..dedb5879 100644 --- a/Dockerfiles/mods/Dockerfile-5.6 +++ b/Dockerfiles/mods/Dockerfile-5.6 @@ -18,99 +18,71 @@ LABEL \ ### Envs ### ENV BUILD_DEPS \ - librabbitmq-dev \ + firebird-dev \ + freetds-dev \ libbz2-dev \ + libc-client-dev \ libcurl4-openssl-dev \ - libxml2-dev \ libenchant-dev \ - libssl-dev \ - libpng-dev \ - libjpeg-dev \ - libxpm-dev \ - libvpx-dev \ - zlib1g-dev \ + libfbclient2 \ libfreetype6-dev \ - libwebp-dev \ libgmp-dev \ - libmagickwand-dev \ - libc-client-dev \ - libkrb5-dev \ - libcurl4-openssl-dev \ - libfbclient2 \ libib-util \ - firebird-dev \ libicu-dev \ + libjpeg-dev \ + libkrb5-dev \ libldap2-dev \ - libsasl2-dev \ + libmagickwand-dev \ libmcrypt-dev \ - zlib1g-dev \ - zlib1g-dev \ libmemcached-dev \ - libssl-dev \ - libsasl2-dev \ - libssl-dev \ - libsasl2-dev \ - freetds-dev \ - libfbclient2 \ - libib-util \ - firebird-dev \ - zlib1g-dev \ - libpq-dev \ - libsqlite3-dev \ + libnghttp2-dev \ + libpng-dev \ libpq-dev \ libpspell-dev \ - libedit-dev \ - libreadline-dev \ - librecode-dev \ + librabbitmq-dev \ librdkafka-dev \ - libmm-dev \ - libxml2-dev \ - libssl-dev \ + librecode-dev \ + libsasl2-dev \ libsnmp-dev \ - snmp \ - libxml2-dev \ - libnghttp2-dev \ libssl-dev \ libtidy-dev \ + libvpx-dev \ + libwebp-dev \ libxml2-dev \ - libxml2-dev \ - libxml2-dev \ - libxml2-dev \ - libxml2-dev \ + libxpm-dev \ libxslt-dev \ - zlib1g-dev \ libzip-dev \ + snmp \ + zlib1g-dev \ ca-certificates \ git ENV RUN_DEPS \ - librabbitmq4 \ - libenchant1c2a \ - libpng16-16 \ - libjpeg62-turbo \ - libxpm4 \ - libvpx4 \ - libfreetype6 \ - libwebp6 \ - libmagickwand-6.q16-3 \ + libaspell15 \ libc-client2007e \ + libenchant1c2a \ libfbclient2 \ + libfreetype6 \ libicu57 \ + libjpeg62-turbo \ + libmagickwand-6.q16-3 \ + libmariadbclient18 \ libmcrypt4 \ libmemcachedutil2 \ - libmariadbclient18 \ - libsybdb5 \ - libfbclient2 \ - libpq5 \ + libnghttp2-14 \ + libpng16-16 \ libpq5 \ - libaspell15 \ - librecode0 \ + librabbitmq4 \ librdkafka1 \ - snmp \ - libnghttp2-14 \ + librecode0 \ + libsybdb5 \ libtidy5 \ + libvpx4 \ + libwebp6 \ + libxpm4 \ libxslt1.1 \ libzip4 \ + snmp \ ca-certificates @@ -118,8 +90,9 @@ ENV RUN_DEPS \ ### Install ### RUN set -x \ - && apt-get update \ - && apt-get install --no-install-recommends --no-install-suggests -y \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ ${BUILD_DEPS} \ \ \ @@ -140,24 +113,15 @@ RUN set -x \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) bcmath \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) bz2 \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) calendar \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) ctype \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) curl \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) dba \ - && /usr/local/bin/docker-php-ext-configure dom --with-libxml-dir=/usr \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) dom \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) enchant \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) exif \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) fileinfo \ - && /usr/local/bin/docker-php-ext-configure ftp --with-openssl-dir \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) ftp \ && ln -s /usr/lib/x86_64-linux-gnu/libXpm.* /usr/lib/ \ && /usr/local/bin/docker-php-ext-configure gd --with-gd --with-vpx-dir=/usr --with-jpeg-dir=/usr --with-png-dir=/usr --with-zlib-dir=/usr --with-xpm-dir=/usr --with-freetype-dir=/usr --enable-gd-jis-conv --enable-gd-native-ttf \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gd \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gettext \ && ln /usr/include/x86_64-linux-gnu/gmp.h /usr/include/ \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gmp \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) hash \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) iconv \ && pecl install igbinary \ && docker-php-ext-enable igbinary \ && pecl install imagick \ @@ -167,11 +131,9 @@ RUN set -x \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) imap \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) interbase \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) intl \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) json \ && ln -s /usr/lib/x86_64-linux-gnu/libldap* /usr/lib/ \ && /usr/local/bin/docker-php-ext-configure ldap --with-ldap --with-ldap-sasl \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) ldap \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mbstring \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mcrypt \ && pecl install memcache \ && docker-php-ext-enable memcache \ @@ -187,14 +149,12 @@ RUN set -x \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysqli \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) opcache \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pcntl \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo \ && ln -s /usr/lib/x86_64-linux-gnu/libsybdb.* /usr/lib/ \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_dblib \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_firebird \ && /usr/local/bin/docker-php-ext-configure pdo_mysql --with-zlib-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_mysql \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_pgsql \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_sqlite \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pgsql \ && git clone -v https://github.com/phalcon/cphalcon /tmp/phalcon \ && cd /tmp/phalcon \ @@ -202,19 +162,13 @@ RUN set -x \ && cd build && ./install \ && docker-php-ext-enable phalcon \ && cd / && rm -rf /tmp/phalcon \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) posix \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pspell \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) readline \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \ && pecl install redis \ && docker-php-ext-enable redis \ && pecl install rdkafka \ && docker-php-ext-enable rdkafka \ - && /usr/local/bin/docker-php-ext-configure session --with-mm \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) session \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) shmop \ - && /usr/local/bin/docker-php-ext-configure simplexml --with-libxml-dir=/usr \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) simplexml \ && /usr/local/bin/docker-php-ext-configure snmp --with-openssl-dir \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) snmp \ && /usr/local/bin/docker-php-ext-configure soap --with-libxml-dir=/usr \ @@ -226,32 +180,21 @@ RUN set -x \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvsem \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvshm \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) tidy \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) tokenizer \ && pecl install uploadprogress \ && docker-php-ext-enable uploadprogress \ && /usr/local/bin/docker-php-ext-configure wddx --with-libxml-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) wddx \ && pecl install xdebug-2.4.1 \ && docker-php-ext-enable xdebug \ - && /usr/local/bin/docker-php-ext-configure xml --with-libxml-dir=/usr \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xml \ - && /usr/local/bin/docker-php-ext-configure xmlreader --with-libxml-dir=/usr \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xmlreader \ && /usr/local/bin/docker-php-ext-configure xmlrpc --with-libxml-dir=/usr --with-iconv-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xmlrpc \ - && /usr/local/bin/docker-php-ext-configure xmlwriter --with-libxml-dir=/usr \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xmlwriter \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xsl \ && /usr/local/bin/docker-php-ext-configure zip --with-zlib-dir=/usr --with-pcre-dir=/usr --with-libzip \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) zip \ \ - \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps \ - ${BUILD_DEPS} \ - \ - \ - && apt-get install --no-install-recommends --no-install-suggests -y \ - ${RUN_DEPS} \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false ${BUILD_DEPS} \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests ${RUN_DEPS} \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ && update-ca-certificates \ && sh -c "find /usr/local -type f -perm /u+x -exec strip --strip-all '{}' + || true" @@ -261,12 +204,21 @@ RUN set -x \ ### Verify ### RUN set -x \ + && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^5.6' \ && /usr/local/sbin/php-fpm --test \ + \ && PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \ - && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi - -RUN set -x \ + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + && PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + \ + && PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && rm -f /usr/local/etc/php/php.ini \ + \ && php -m | grep -oiE '^amqp$' \ && php-fpm -m | grep -oiE '^amqp$' \ && php -m | grep -oiE '^apcu$' \ @@ -291,6 +243,8 @@ RUN set -x \ && php-fpm -m | grep -oiE '^exif$' \ && php -m | grep -oiE '^fileinfo$' \ && php-fpm -m | grep -oiE '^fileinfo$' \ + && php -m | grep -oiE '^filter$' \ + && php-fpm -m | grep -oiE '^filter$' \ && php -m | grep -oiE '^ftp$' \ && php-fpm -m | grep -oiE '^ftp$' \ && php -m | grep -oiE '^gd$' \ @@ -317,6 +271,8 @@ RUN set -x \ && php-fpm -m | grep -oiE '^json$' \ && php -m | grep -oiE '^ldap$' \ && php-fpm -m | grep -oiE '^ldap$' \ + && php -m | grep -oiE '^libxml$' \ + && php-fpm -m | grep -oiE '^libxml$' \ && php -m | grep -oiE '^mbstring$' \ && php-fpm -m | grep -oiE '^mbstring$' \ && php -m | grep -oiE '^mcrypt$' \ @@ -335,10 +291,16 @@ RUN set -x \ && php-fpm -m | grep -oiE '^mysql$' \ && php -m | grep -oiE '^mysqli$' \ && php-fpm -m | grep -oiE '^mysqli$' \ + && php -m | grep -oiE '^mysqlnd$' \ + && php-fpm -m | grep -oiE '^mysqlnd$' \ && php -m | grep -oiE '^Zend Opcache$' \ && php-fpm -m | grep -oiE '^Zend Opcache$' \ + && php -m | grep -oiE '^openssl$' \ + && php-fpm -m | grep -oiE '^openssl$' \ && php -m | grep -oiE '^pcntl$' \ && php-fpm -m | grep -oiE '^pcntl$' \ + && php -m | grep -oiE '^pcre$' \ + && php-fpm -m | grep -oiE '^pcre$' \ && php -m | grep -oiE '^pdo$' \ && php-fpm -m | grep -oiE '^pdo$' \ && php -m | grep -oiE '^pdo_dblib$' \ diff --git a/Dockerfiles/mods/Dockerfile-7.0 b/Dockerfiles/mods/Dockerfile-7.0 index f4001b5a..4f4c6d6b 100644 --- a/Dockerfiles/mods/Dockerfile-7.0 +++ b/Dockerfiles/mods/Dockerfile-7.0 @@ -18,96 +18,70 @@ LABEL \ ### Envs ### ENV BUILD_DEPS \ - librabbitmq-dev \ + firebird-dev \ + freetds-dev \ libbz2-dev \ + libc-client-dev \ libcurl4-openssl-dev \ - libxml2-dev \ libenchant-dev \ - libssl-dev \ - libpng-dev \ - libjpeg-dev \ - libxpm-dev \ - libvpx-dev \ - zlib1g-dev \ + libfbclient2 \ libfreetype6-dev \ - libwebp-dev \ libgmp-dev \ - libmagickwand-dev \ - libc-client-dev \ - libkrb5-dev \ - libcurl4-openssl-dev \ - libfbclient2 \ libib-util \ - firebird-dev \ libicu-dev \ - bison \ + libjpeg-dev \ + libkrb5-dev \ libldap2-dev \ - libsasl2-dev \ + libmagickwand-dev \ libmcrypt-dev \ - zlib1g-dev \ - zlib1g-dev \ libmemcached-dev \ - libssl-dev \ - libsasl2-dev \ - freetds-dev \ - libfbclient2 \ - libib-util \ - firebird-dev \ - zlib1g-dev \ - libpq-dev \ - libsqlite3-dev \ + libnghttp2-dev \ + libpng-dev \ libpq-dev \ libpspell-dev \ - libedit-dev \ - libreadline-dev \ - librecode-dev \ + librabbitmq-dev \ librdkafka-dev \ - libmm-dev \ - libxml2-dev \ - libssl-dev \ + librecode-dev \ + libsasl2-dev \ libsnmp-dev \ - snmp \ - libxml2-dev \ - libnghttp2-dev \ libssl-dev \ libtidy-dev \ + libvpx-dev \ + libwebp-dev \ libxml2-dev \ - libxml2-dev \ - libxml2-dev \ - libxml2-dev \ + libxpm-dev \ libxslt-dev \ - zlib1g-dev \ libzip-dev \ + snmp \ + zlib1g-dev \ ca-certificates \ git ENV RUN_DEPS \ - librabbitmq4 \ - libenchant1c2a \ - libpng16-16 \ - libjpeg62-turbo \ - libxpm4 \ - libvpx4 \ - libfreetype6 \ - libwebp6 \ - libmagickwand-6.q16-3 \ + libaspell15 \ libc-client2007e \ + libenchant1c2a \ libfbclient2 \ + libfreetype6 \ libicu57 \ + libjpeg62-turbo \ + libmagickwand-6.q16-3 \ libmcrypt4 \ libmemcachedutil2 \ - libsybdb5 \ - libfbclient2 \ - libpq5 \ + libnghttp2-14 \ + libpng16-16 \ libpq5 \ - libaspell15 \ - librecode0 \ + librabbitmq4 \ librdkafka1 \ - snmp \ - libnghttp2-14 \ + librecode0 \ + libsybdb5 \ libtidy5 \ + libvpx4 \ + libwebp6 \ + libxpm4 \ libxslt1.1 \ libzip4 \ + snmp \ ca-certificates @@ -115,8 +89,9 @@ ENV RUN_DEPS \ ### Install ### RUN set -x \ - && apt-get update \ - && apt-get install --no-install-recommends --no-install-suggests -y \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ ${BUILD_DEPS} \ \ \ @@ -137,24 +112,15 @@ RUN set -x \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) bcmath \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) bz2 \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) calendar \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) ctype \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) curl \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) dba \ - && /usr/local/bin/docker-php-ext-configure dom --with-libxml-dir=/usr \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) dom \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) enchant \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) exif \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) fileinfo \ - && /usr/local/bin/docker-php-ext-configure ftp --with-openssl-dir \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) ftp \ && ln -s /usr/lib/x86_64-linux-gnu/libXpm.* /usr/lib/ \ && /usr/local/bin/docker-php-ext-configure gd --with-gd --with-webp-dir=/usr --with-jpeg-dir=/usr --with-png-dir=/usr --with-zlib-dir=/usr --with-xpm-dir=/usr --with-freetype-dir=/usr --enable-gd-jis-conv --enable-gd-native-ttf \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gd \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gettext \ && ln /usr/include/x86_64-linux-gnu/gmp.h /usr/include/ \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gmp \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) hash \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) iconv \ && pecl install igbinary \ && docker-php-ext-enable igbinary \ && pecl install imagick \ @@ -164,11 +130,9 @@ RUN set -x \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) imap \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) interbase \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) intl \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) json \ && ln -s /usr/lib/x86_64-linux-gnu/libldap* /usr/lib/ \ && /usr/local/bin/docker-php-ext-configure ldap --with-ldap --with-ldap-sasl \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) ldap \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mbstring \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mcrypt \ && git clone -v https://github.com/websupport-sk/pecl-memcache /tmp/memcache \ && cd /tmp/memcache \ @@ -187,13 +151,13 @@ RUN set -x \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysqli \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) opcache \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pcntl \ + && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo \ && ln -s /usr/lib/x86_64-linux-gnu/libsybdb.* /usr/lib/ \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_dblib \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_firebird \ && /usr/local/bin/docker-php-ext-configure pdo_mysql --with-zlib-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_mysql \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_pgsql \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_sqlite \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pgsql \ && git clone -v https://github.com/phalcon/cphalcon /tmp/phalcon \ && cd /tmp/phalcon \ @@ -201,19 +165,13 @@ RUN set -x \ && cd build && ./install \ && docker-php-ext-enable phalcon \ && cd / && rm -rf /tmp/phalcon \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) posix \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pspell \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) readline \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \ && pecl install redis \ && docker-php-ext-enable redis \ && pecl install rdkafka \ && docker-php-ext-enable rdkafka \ - && /usr/local/bin/docker-php-ext-configure session --with-mm \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) session \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) shmop \ - && /usr/local/bin/docker-php-ext-configure simplexml --with-libxml-dir=/usr \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) simplexml \ && /usr/local/bin/docker-php-ext-configure snmp --with-openssl-dir \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) snmp \ && /usr/local/bin/docker-php-ext-configure soap --with-libxml-dir=/usr \ @@ -225,7 +183,6 @@ RUN set -x \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvsem \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvshm \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) tidy \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) tokenizer \ && git clone -v https://github.com/php/pecl-php-uploadprogress /tmp/uploadprogress \ && cd /tmp/uploadprogress \ && phpize \ @@ -238,23 +195,15 @@ RUN set -x \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) wddx \ && pecl install xdebug \ && docker-php-ext-enable xdebug \ - && /usr/local/bin/docker-php-ext-configure xml --with-libxml-dir=/usr \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xml \ && /usr/local/bin/docker-php-ext-configure xmlrpc --with-libxml-dir=/usr --with-iconv-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xmlrpc \ - && /usr/local/bin/docker-php-ext-configure xmlwriter --with-libxml-dir=/usr \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xmlwriter \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xsl \ && /usr/local/bin/docker-php-ext-configure zip --with-zlib-dir=/usr --with-pcre-dir=/usr --with-libzip \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) zip \ \ - \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps \ - ${BUILD_DEPS} \ - \ - \ - && apt-get install --no-install-recommends --no-install-suggests -y \ - ${RUN_DEPS} \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false ${BUILD_DEPS} \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests ${RUN_DEPS} \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ && update-ca-certificates \ && sh -c "find /usr/local -type f -perm /u+x -exec strip --strip-all '{}' + || true" @@ -264,12 +213,21 @@ RUN set -x \ ### Verify ### RUN set -x \ + && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^7.0' \ && /usr/local/sbin/php-fpm --test \ + \ && PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \ - && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi - -RUN set -x \ + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + && PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + \ + && PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && rm -f /usr/local/etc/php/php.ini \ + \ && php -m | grep -oiE '^amqp$' \ && php-fpm -m | grep -oiE '^amqp$' \ && php -m | grep -oiE '^apcu$' \ @@ -294,6 +252,8 @@ RUN set -x \ && php-fpm -m | grep -oiE '^exif$' \ && php -m | grep -oiE '^fileinfo$' \ && php-fpm -m | grep -oiE '^fileinfo$' \ + && php -m | grep -oiE '^filter$' \ + && php-fpm -m | grep -oiE '^filter$' \ && php -m | grep -oiE '^ftp$' \ && php-fpm -m | grep -oiE '^ftp$' \ && php -m | grep -oiE '^gd$' \ @@ -320,6 +280,8 @@ RUN set -x \ && php-fpm -m | grep -oiE '^json$' \ && php -m | grep -oiE '^ldap$' \ && php-fpm -m | grep -oiE '^ldap$' \ + && php -m | grep -oiE '^libxml$' \ + && php-fpm -m | grep -oiE '^libxml$' \ && php -m | grep -oiE '^mbstring$' \ && php-fpm -m | grep -oiE '^mbstring$' \ && php -m | grep -oiE '^mcrypt$' \ @@ -334,10 +296,18 @@ RUN set -x \ && php-fpm -m | grep -oiE '^msgpack$' \ && php -m | grep -oiE '^mysqli$' \ && php-fpm -m | grep -oiE '^mysqli$' \ + && php -m | grep -oiE '^mysqlnd$' \ + && php-fpm -m | grep -oiE '^mysqlnd$' \ && php -m | grep -oiE '^Zend Opcache$' \ && php-fpm -m | grep -oiE '^Zend Opcache$' \ + && php -m | grep -oiE '^openssl$' \ + && php-fpm -m | grep -oiE '^openssl$' \ && php -m | grep -oiE '^pcntl$' \ && php-fpm -m | grep -oiE '^pcntl$' \ + && php -m | grep -oiE '^pcre$' \ + && php-fpm -m | grep -oiE '^pcre$' \ + && php -m | grep -oiE '^pdo$' \ + && php-fpm -m | grep -oiE '^pdo$' \ && php -m | grep -oiE '^pdo_dblib$' \ && php-fpm -m | grep -oiE '^pdo_dblib$' \ && php -m | grep -oiE '^pdo_firebird$' \ @@ -396,6 +366,8 @@ RUN set -x \ && php-fpm -m | grep -oiE '^xdebug$' \ && php -m | grep -oiE '^xml$' \ && php-fpm -m | grep -oiE '^xml$' \ + && php -m | grep -oiE '^xmlreader$' \ + && php-fpm -m | grep -oiE '^xmlreader$' \ && php -m | grep -oiE '^xmlrpc$' \ && php-fpm -m | grep -oiE '^xmlrpc$' \ && php -m | grep -oiE '^xmlwriter$' \ diff --git a/Dockerfiles/mods/Dockerfile-7.1 b/Dockerfiles/mods/Dockerfile-7.1 index 460b01d1..39f26686 100644 --- a/Dockerfiles/mods/Dockerfile-7.1 +++ b/Dockerfiles/mods/Dockerfile-7.1 @@ -18,96 +18,70 @@ LABEL \ ### Envs ### ENV BUILD_DEPS \ - librabbitmq-dev \ + firebird-dev \ + freetds-dev \ libbz2-dev \ + libc-client-dev \ libcurl4-openssl-dev \ - libxml2-dev \ libenchant-dev \ - libssl-dev \ - libpng-dev \ - libjpeg-dev \ - libxpm-dev \ - libvpx-dev \ - zlib1g-dev \ + libfbclient2 \ libfreetype6-dev \ - libwebp-dev \ libgmp-dev \ - libmagickwand-dev \ - libc-client-dev \ - libkrb5-dev \ - libcurl4-openssl-dev \ - libfbclient2 \ libib-util \ - firebird-dev \ libicu-dev \ + libjpeg-dev \ + libkrb5-dev \ libldap2-dev \ - libsasl2-dev \ + libmagickwand-dev \ libmcrypt-dev \ - zlib1g-dev \ - zlib1g-dev \ libmemcached-dev \ - libssl-dev \ - libsasl2-dev \ - freetds-dev \ - libfbclient2 \ - libib-util \ - firebird-dev \ - zlib1g-dev \ - libpq-dev \ - libsqlite3-dev \ + libnghttp2-dev \ + libpng-dev \ libpq-dev \ - libssl-dev \ libpspell-dev \ - libedit-dev \ - libreadline-dev \ - librecode-dev \ + librabbitmq-dev \ librdkafka-dev \ - libmm-dev \ - libxml2-dev \ - libssl-dev \ + librecode-dev \ + libsasl2-dev \ libsnmp-dev \ - snmp \ - libxml2-dev \ - libnghttp2-dev \ libssl-dev \ libtidy-dev \ + libvpx-dev \ + libwebp-dev \ libxml2-dev \ - libxml2-dev \ - libxml2-dev \ - libxml2-dev \ + libxpm-dev \ libxslt-dev \ - zlib1g-dev \ libzip-dev \ + snmp \ + zlib1g-dev \ ca-certificates \ git ENV RUN_DEPS \ - librabbitmq4 \ - libenchant1c2a \ - libpng16-16 \ - libjpeg62-turbo \ - libxpm4 \ - libvpx4 \ - libfreetype6 \ - libwebp6 \ - libmagickwand-6.q16-3 \ + libaspell15 \ libc-client2007e \ + libenchant1c2a \ libfbclient2 \ + libfreetype6 \ libicu57 \ + libjpeg62-turbo \ + libmagickwand-6.q16-3 \ libmcrypt4 \ libmemcachedutil2 \ - libsybdb5 \ - libfbclient2 \ - libpq5 \ + libnghttp2-14 \ + libpng16-16 \ libpq5 \ - libaspell15 \ - librecode0 \ + librabbitmq4 \ librdkafka1 \ - snmp \ - libnghttp2-14 \ + librecode0 \ + libsybdb5 \ libtidy5 \ + libvpx4 \ + libwebp6 \ + libxpm4 \ libxslt1.1 \ libzip4 \ + snmp \ ca-certificates @@ -115,8 +89,9 @@ ENV RUN_DEPS \ ### Install ### RUN set -x \ - && apt-get update \ - && apt-get install --no-install-recommends --no-install-suggests -y \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ ${BUILD_DEPS} \ \ \ @@ -137,24 +112,15 @@ RUN set -x \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) bcmath \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) bz2 \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) calendar \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) ctype \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) curl \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) dba \ - && /usr/local/bin/docker-php-ext-configure dom --with-libxml-dir=/usr \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) dom \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) enchant \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) exif \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) fileinfo \ - && /usr/local/bin/docker-php-ext-configure ftp --with-openssl-dir \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) ftp \ && ln -s /usr/lib/x86_64-linux-gnu/libXpm.* /usr/lib/ \ && /usr/local/bin/docker-php-ext-configure gd --with-gd --with-webp-dir=/usr --with-jpeg-dir=/usr --with-png-dir=/usr --with-zlib-dir=/usr --with-xpm-dir=/usr --with-freetype-dir=/usr --enable-gd-jis-conv --enable-gd-native-ttf \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gd \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gettext \ && ln /usr/include/x86_64-linux-gnu/gmp.h /usr/include/ \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gmp \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) hash \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) iconv \ && pecl install igbinary \ && docker-php-ext-enable igbinary \ && pecl install imagick \ @@ -164,11 +130,9 @@ RUN set -x \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) imap \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) interbase \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) intl \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) json \ && ln -s /usr/lib/x86_64-linux-gnu/libldap* /usr/lib/ \ && /usr/local/bin/docker-php-ext-configure ldap --with-ldap --with-ldap-sasl \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) ldap \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mbstring \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mcrypt \ && git clone -v https://github.com/websupport-sk/pecl-memcache /tmp/memcache \ && cd /tmp/memcache \ @@ -187,14 +151,12 @@ RUN set -x \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysqli \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) opcache \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pcntl \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo \ && ln -s /usr/lib/x86_64-linux-gnu/libsybdb.* /usr/lib/ \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_dblib \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_firebird \ && /usr/local/bin/docker-php-ext-configure pdo_mysql --with-zlib-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_mysql \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_pgsql \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_sqlite \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pgsql \ && git clone -v https://github.com/phalcon/cphalcon /tmp/phalcon \ && cd /tmp/phalcon \ @@ -202,20 +164,13 @@ RUN set -x \ && cd build && ./install \ && docker-php-ext-enable phalcon \ && cd / && rm -rf /tmp/phalcon \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) phar \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) posix \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pspell \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) readline \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \ && pecl install redis \ && docker-php-ext-enable redis \ && pecl install rdkafka \ && docker-php-ext-enable rdkafka \ - && /usr/local/bin/docker-php-ext-configure session --with-mm \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) session \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) shmop \ - && /usr/local/bin/docker-php-ext-configure simplexml --with-libxml-dir=/usr \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) simplexml \ && /usr/local/bin/docker-php-ext-configure snmp --with-openssl-dir \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) snmp \ && /usr/local/bin/docker-php-ext-configure soap --with-libxml-dir=/usr \ @@ -227,7 +182,6 @@ RUN set -x \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvsem \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvshm \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) tidy \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) tokenizer \ && git clone -v https://github.com/php/pecl-php-uploadprogress /tmp/uploadprogress \ && cd /tmp/uploadprogress \ && phpize \ @@ -240,23 +194,15 @@ RUN set -x \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) wddx \ && pecl install xdebug \ && docker-php-ext-enable xdebug \ - && /usr/local/bin/docker-php-ext-configure xml --with-libxml-dir=/usr \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xml \ && /usr/local/bin/docker-php-ext-configure xmlrpc --with-libxml-dir=/usr --with-iconv-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xmlrpc \ - && /usr/local/bin/docker-php-ext-configure xmlwriter --with-libxml-dir=/usr \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xmlwriter \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xsl \ && /usr/local/bin/docker-php-ext-configure zip --with-zlib-dir=/usr --with-pcre-dir=/usr --with-libzip \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) zip \ \ - \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps \ - ${BUILD_DEPS} \ - \ - \ - && apt-get install --no-install-recommends --no-install-suggests -y \ - ${RUN_DEPS} \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false ${BUILD_DEPS} \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests ${RUN_DEPS} \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ && update-ca-certificates \ && sh -c "find /usr/local -type f -perm /u+x -exec strip --strip-all '{}' + || true" @@ -266,12 +212,21 @@ RUN set -x \ ### Verify ### RUN set -x \ + && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^7.1' \ && /usr/local/sbin/php-fpm --test \ + \ && PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \ - && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi - -RUN set -x \ + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + && PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + \ + && PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && rm -f /usr/local/etc/php/php.ini \ + \ && php -m | grep -oiE '^amqp$' \ && php-fpm -m | grep -oiE '^amqp$' \ && php -m | grep -oiE '^apcu$' \ @@ -296,6 +251,8 @@ RUN set -x \ && php-fpm -m | grep -oiE '^exif$' \ && php -m | grep -oiE '^fileinfo$' \ && php-fpm -m | grep -oiE '^fileinfo$' \ + && php -m | grep -oiE '^filter$' \ + && php-fpm -m | grep -oiE '^filter$' \ && php -m | grep -oiE '^ftp$' \ && php-fpm -m | grep -oiE '^ftp$' \ && php -m | grep -oiE '^gd$' \ @@ -322,6 +279,8 @@ RUN set -x \ && php-fpm -m | grep -oiE '^json$' \ && php -m | grep -oiE '^ldap$' \ && php-fpm -m | grep -oiE '^ldap$' \ + && php -m | grep -oiE '^libxml$' \ + && php-fpm -m | grep -oiE '^libxml$' \ && php -m | grep -oiE '^mbstring$' \ && php-fpm -m | grep -oiE '^mbstring$' \ && php -m | grep -oiE '^mcrypt$' \ @@ -336,10 +295,16 @@ RUN set -x \ && php-fpm -m | grep -oiE '^msgpack$' \ && php -m | grep -oiE '^mysqli$' \ && php-fpm -m | grep -oiE '^mysqli$' \ + && php -m | grep -oiE '^mysqlnd$' \ + && php-fpm -m | grep -oiE '^mysqlnd$' \ && php -m | grep -oiE '^Zend Opcache$' \ && php-fpm -m | grep -oiE '^Zend Opcache$' \ + && php -m | grep -oiE '^openssl$' \ + && php-fpm -m | grep -oiE '^openssl$' \ && php -m | grep -oiE '^pcntl$' \ && php-fpm -m | grep -oiE '^pcntl$' \ + && php -m | grep -oiE '^pcre$' \ + && php-fpm -m | grep -oiE '^pcre$' \ && php -m | grep -oiE '^pdo$' \ && php-fpm -m | grep -oiE '^pdo$' \ && php -m | grep -oiE '^pdo_dblib$' \ @@ -402,6 +367,8 @@ RUN set -x \ && php-fpm -m | grep -oiE '^xdebug$' \ && php -m | grep -oiE '^xml$' \ && php-fpm -m | grep -oiE '^xml$' \ + && php -m | grep -oiE '^xmlreader$' \ + && php-fpm -m | grep -oiE '^xmlreader$' \ && php -m | grep -oiE '^xmlrpc$' \ && php-fpm -m | grep -oiE '^xmlrpc$' \ && php -m | grep -oiE '^xmlwriter$' \ diff --git a/Dockerfiles/mods/Dockerfile-7.2 b/Dockerfiles/mods/Dockerfile-7.2 index 2ad019d3..275c869d 100644 --- a/Dockerfiles/mods/Dockerfile-7.2 +++ b/Dockerfiles/mods/Dockerfile-7.2 @@ -18,97 +18,70 @@ LABEL \ ### Envs ### ENV BUILD_DEPS \ - librabbitmq-dev \ + firebird-dev \ + freetds-dev \ libbz2-dev \ + libc-client-dev \ libcurl4-openssl-dev \ - libxml2-dev \ libenchant-dev \ - libssl-dev \ - libpng-dev \ - libjpeg-dev \ - libxpm-dev \ - libvpx-dev \ - zlib1g-dev \ + libfbclient2 \ libfreetype6-dev \ - libwebp-dev \ libgmp-dev \ - libmagickwand-dev \ - libc-client-dev \ - libkrb5-dev \ - libcurl4-openssl-dev \ - libfbclient2 \ libib-util \ - firebird-dev \ libicu-dev \ + libjpeg-dev \ + libkrb5-dev \ libldap2-dev \ - libsasl2-dev \ + libmagickwand-dev \ libmcrypt-dev \ - zlib1g-dev \ - zlib1g-dev \ libmemcached-dev \ - libssl-dev \ - libsasl2-dev \ - freetds-dev \ - libfbclient2 \ - libib-util \ - firebird-dev \ - zlib1g-dev \ - libpq-dev \ - libsqlite3-dev \ + libnghttp2-dev \ + libpng-dev \ libpq-dev \ - libssl-dev \ libpspell-dev \ - libedit-dev \ - libreadline-dev \ - librecode-dev \ + librabbitmq-dev \ librdkafka-dev \ - libmm-dev \ - libxml2-dev \ - libssl-dev \ + librecode-dev \ + libsasl2-dev \ libsnmp-dev \ - snmp \ - libxml2-dev \ - libsodium-dev \ - libnghttp2-dev \ libssl-dev \ libtidy-dev \ + libvpx-dev \ + libwebp-dev \ libxml2-dev \ - libxml2-dev \ - libxml2-dev \ - libxml2-dev \ + libxpm-dev \ libxslt-dev \ - zlib1g-dev \ libzip-dev \ + snmp \ + zlib1g-dev \ ca-certificates \ git ENV RUN_DEPS \ - librabbitmq4 \ - libenchant1c2a \ - libpng16-16 \ - libjpeg62-turbo \ - libxpm4 \ - libvpx4 \ - libfreetype6 \ - libwebp6 \ - libmagickwand-6.q16-3 \ + libaspell15 \ libc-client2007e \ + libenchant1c2a \ libfbclient2 \ + libfreetype6 \ libicu57 \ + libjpeg62-turbo \ + libmagickwand-6.q16-3 \ libmcrypt4 \ libmemcachedutil2 \ - libsybdb5 \ - libfbclient2 \ - libpq5 \ + libnghttp2-14 \ + libpng16-16 \ libpq5 \ - libaspell15 \ - librecode0 \ + librabbitmq4 \ librdkafka1 \ - snmp \ - libnghttp2-14 \ + librecode0 \ + libsybdb5 \ libtidy5 \ + libvpx4 \ + libwebp6 \ + libxpm4 \ libxslt1.1 \ libzip4 \ + snmp \ ca-certificates @@ -116,8 +89,9 @@ ENV RUN_DEPS \ ### Install ### RUN set -x \ - && apt-get update \ - && apt-get install --no-install-recommends --no-install-suggests -y \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ ${BUILD_DEPS} \ \ \ @@ -138,24 +112,15 @@ RUN set -x \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) bcmath \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) bz2 \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) calendar \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) ctype \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) curl \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) dba \ - && /usr/local/bin/docker-php-ext-configure dom --with-libxml-dir=/usr \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) dom \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) enchant \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) exif \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) fileinfo \ - && /usr/local/bin/docker-php-ext-configure ftp --with-openssl-dir \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) ftp \ && ln -s /usr/lib/x86_64-linux-gnu/libXpm.* /usr/lib/ \ && /usr/local/bin/docker-php-ext-configure gd --with-gd --with-webp-dir=/usr --with-jpeg-dir=/usr --with-png-dir=/usr --with-zlib-dir=/usr --with-xpm-dir=/usr --with-freetype-dir=/usr --enable-gd-jis-conv \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gd \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gettext \ && ln /usr/include/x86_64-linux-gnu/gmp.h /usr/include/ \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gmp \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) hash \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) iconv \ && pecl install igbinary \ && docker-php-ext-enable igbinary \ && pecl install imagick \ @@ -165,11 +130,9 @@ RUN set -x \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) imap \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) interbase \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) intl \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) json \ && ln -s /usr/lib/x86_64-linux-gnu/libldap* /usr/lib/ \ && /usr/local/bin/docker-php-ext-configure ldap --with-ldap --with-ldap-sasl \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) ldap \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mbstring \ && pecl install mcrypt-1.0.1 \ && docker-php-ext-enable mcrypt \ && git clone -v https://github.com/websupport-sk/pecl-memcache /tmp/memcache \ @@ -189,14 +152,12 @@ RUN set -x \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysqli \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) opcache \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pcntl \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo \ && ln -s /usr/lib/x86_64-linux-gnu/libsybdb.* /usr/lib/ \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_dblib \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_firebird \ && /usr/local/bin/docker-php-ext-configure pdo_mysql --with-zlib-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_mysql \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_pgsql \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_sqlite \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pgsql \ && git clone -v https://github.com/phalcon/cphalcon /tmp/phalcon \ && cd /tmp/phalcon \ @@ -204,33 +165,24 @@ RUN set -x \ && cd build && ./install \ && docker-php-ext-enable phalcon \ && cd / && rm -rf /tmp/phalcon \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) phar \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) posix \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pspell \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) readline \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \ && pecl install redis \ && docker-php-ext-enable redis \ && pecl install rdkafka \ && docker-php-ext-enable rdkafka \ - && /usr/local/bin/docker-php-ext-configure session --with-mm \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) session \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) shmop \ - && /usr/local/bin/docker-php-ext-configure simplexml --with-libxml-dir=/usr \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) simplexml \ && /usr/local/bin/docker-php-ext-configure snmp --with-openssl-dir \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) snmp \ && /usr/local/bin/docker-php-ext-configure soap --with-libxml-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) soap \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sockets \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sodium \ && pecl install swoole \ && docker-php-ext-enable swoole \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvmsg \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvsem \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvshm \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) tidy \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) tokenizer \ && git clone -v https://github.com/php/pecl-php-uploadprogress /tmp/uploadprogress \ && cd /tmp/uploadprogress \ && phpize \ @@ -243,23 +195,15 @@ RUN set -x \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) wddx \ && pecl install xdebug \ && docker-php-ext-enable xdebug \ - && /usr/local/bin/docker-php-ext-configure xml --with-libxml-dir=/usr \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xml \ && /usr/local/bin/docker-php-ext-configure xmlrpc --with-libxml-dir=/usr --with-iconv-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xmlrpc \ - && /usr/local/bin/docker-php-ext-configure xmlwriter --with-libxml-dir=/usr \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xmlwriter \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xsl \ && /usr/local/bin/docker-php-ext-configure zip --with-zlib-dir=/usr --with-pcre-dir=/usr --with-libzip \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) zip \ \ - \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps \ - ${BUILD_DEPS} \ - \ - \ - && apt-get install --no-install-recommends --no-install-suggests -y \ - ${RUN_DEPS} \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false ${BUILD_DEPS} \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests ${RUN_DEPS} \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ && update-ca-certificates \ && sh -c "find /usr/local -type f -perm /u+x -exec strip --strip-all '{}' + || true" @@ -269,12 +213,21 @@ RUN set -x \ ### Verify ### RUN set -x \ + && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^7.2' \ && /usr/local/sbin/php-fpm --test \ + \ && PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \ - && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi - -RUN set -x \ + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + && PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + \ + && PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && rm -f /usr/local/etc/php/php.ini \ + \ && php -m | grep -oiE '^amqp$' \ && php-fpm -m | grep -oiE '^amqp$' \ && php -m | grep -oiE '^apcu$' \ @@ -299,6 +252,8 @@ RUN set -x \ && php-fpm -m | grep -oiE '^exif$' \ && php -m | grep -oiE '^fileinfo$' \ && php-fpm -m | grep -oiE '^fileinfo$' \ + && php -m | grep -oiE '^filter$' \ + && php-fpm -m | grep -oiE '^filter$' \ && php -m | grep -oiE '^ftp$' \ && php-fpm -m | grep -oiE '^ftp$' \ && php -m | grep -oiE '^gd$' \ @@ -325,6 +280,8 @@ RUN set -x \ && php-fpm -m | grep -oiE '^json$' \ && php -m | grep -oiE '^ldap$' \ && php-fpm -m | grep -oiE '^ldap$' \ + && php -m | grep -oiE '^libxml$' \ + && php-fpm -m | grep -oiE '^libxml$' \ && php -m | grep -oiE '^mbstring$' \ && php-fpm -m | grep -oiE '^mbstring$' \ && php -m | grep -oiE '^mcrypt$' \ @@ -339,10 +296,16 @@ RUN set -x \ && php-fpm -m | grep -oiE '^msgpack$' \ && php -m | grep -oiE '^mysqli$' \ && php-fpm -m | grep -oiE '^mysqli$' \ + && php -m | grep -oiE '^mysqlnd$' \ + && php-fpm -m | grep -oiE '^mysqlnd$' \ && php -m | grep -oiE '^Zend Opcache$' \ && php-fpm -m | grep -oiE '^Zend Opcache$' \ + && php -m | grep -oiE '^openssl$' \ + && php-fpm -m | grep -oiE '^openssl$' \ && php -m | grep -oiE '^pcntl$' \ && php-fpm -m | grep -oiE '^pcntl$' \ + && php -m | grep -oiE '^pcre$' \ + && php-fpm -m | grep -oiE '^pcre$' \ && php -m | grep -oiE '^pdo$' \ && php-fpm -m | grep -oiE '^pdo$' \ && php -m | grep -oiE '^pdo_dblib$' \ @@ -407,6 +370,8 @@ RUN set -x \ && php-fpm -m | grep -oiE '^xdebug$' \ && php -m | grep -oiE '^xml$' \ && php-fpm -m | grep -oiE '^xml$' \ + && php -m | grep -oiE '^xmlreader$' \ + && php-fpm -m | grep -oiE '^xmlreader$' \ && php -m | grep -oiE '^xmlrpc$' \ && php-fpm -m | grep -oiE '^xmlrpc$' \ && php -m | grep -oiE '^xmlwriter$' \ diff --git a/Dockerfiles/mods/Dockerfile-7.3 b/Dockerfiles/mods/Dockerfile-7.3 index 5bbb0e09..9f12c555 100644 --- a/Dockerfiles/mods/Dockerfile-7.3 +++ b/Dockerfiles/mods/Dockerfile-7.3 @@ -18,97 +18,71 @@ LABEL \ ### Envs ### ENV BUILD_DEPS \ + cmake \ + firebird-dev \ + freetds-dev \ libbz2-dev \ + libc-client-dev \ libcurl4-openssl-dev \ - libxml2-dev \ libenchant-dev \ - libssl-dev \ - libpng-dev \ - libjpeg-dev \ - libxpm-dev \ - libvpx-dev \ - zlib1g-dev \ + libfbclient2 \ libfreetype6-dev \ - libwebp-dev \ libgmp-dev \ - libmagickwand-dev \ - libc-client-dev \ - libkrb5-dev \ - libcurl4-openssl-dev \ - libfbclient2 \ + libhiredis-dev \ libib-util \ - firebird-dev \ libicu-dev \ + libjpeg-dev \ + libkrb5-dev \ libldap2-dev \ - libsasl2-dev \ + libmagickwand-dev \ libmcrypt-dev \ - zlib1g-dev \ libmemcached-dev \ - libssl-dev \ - libsasl2-dev \ - freetds-dev \ - libfbclient2 \ - libib-util \ - firebird-dev \ - zlib1g-dev \ - libpq-dev \ - libsqlite3-dev \ + libnghttp2-dev \ + libpng-dev \ libpq-dev \ - libssl-dev \ libpspell-dev \ - libedit-dev \ - libreadline-dev \ - librecode-dev \ librdkafka-dev \ - libmm-dev \ - libxml2-dev \ - libssl-dev \ + librecode-dev \ + libsasl2-dev \ libsnmp-dev \ - snmp \ - libxml2-dev \ - libsodium-dev \ - libnghttp2-dev \ libssl-dev \ - libhiredis-dev \ - cmake \ libtidy-dev \ + libvpx-dev \ + libwebp-dev \ libxml2-dev \ - libxml2-dev \ - libxml2-dev \ - libxml2-dev \ + libxpm-dev \ libxslt-dev \ - zlib1g-dev \ libzip-dev \ + snmp \ + zlib1g-dev \ ca-certificates \ git ENV RUN_DEPS \ - libenchant1c2a \ - libpng16-16 \ - libjpeg62-turbo \ - libxpm4 \ - libvpx4 \ - libfreetype6 \ - libwebp6 \ - libmagickwand-6.q16-3 \ + libaspell15 \ libc-client2007e \ + libenchant1c2a \ libfbclient2 \ + libfreetype6 \ + libhiredis0.13 \ libicu57 \ + libjpeg62-turbo \ + libmagickwand-6.q16-3 \ libmcrypt4 \ libmemcachedutil2 \ - libsybdb5 \ - libfbclient2 \ - libpq5 \ + libnghttp2-14 \ + libpng16-16 \ libpq5 \ - libaspell15 \ - librecode0 \ librdkafka1 \ - snmp \ - libnghttp2-14 \ - libhiredis0.13 \ + librecode0 \ + libsybdb5 \ libtidy5 \ + libvpx4 \ + libwebp6 \ + libxpm4 \ libxslt1.1 \ libzip4 \ + snmp \ ca-certificates @@ -116,8 +90,9 @@ ENV RUN_DEPS \ ### Install ### RUN set -x \ - && apt-get update \ - && apt-get install --no-install-recommends --no-install-suggests -y \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ ${BUILD_DEPS} \ \ \ @@ -126,24 +101,15 @@ RUN set -x \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) bcmath \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) bz2 \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) calendar \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) ctype \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) curl \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) dba \ - && /usr/local/bin/docker-php-ext-configure dom --with-libxml-dir=/usr \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) dom \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) enchant \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) exif \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) fileinfo \ - && /usr/local/bin/docker-php-ext-configure ftp --with-openssl-dir \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) ftp \ && ln -s /usr/lib/x86_64-linux-gnu/libXpm.* /usr/lib/ \ && /usr/local/bin/docker-php-ext-configure gd --with-gd --with-webp-dir=/usr --with-jpeg-dir=/usr --with-png-dir=/usr --with-zlib-dir=/usr --with-xpm-dir=/usr --with-freetype-dir=/usr --enable-gd-jis-conv \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gd \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gettext \ && ln /usr/include/x86_64-linux-gnu/gmp.h /usr/include/ \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gmp \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) hash \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) iconv \ && pecl install igbinary \ && docker-php-ext-enable igbinary \ && pecl install imagick \ @@ -153,7 +119,6 @@ RUN set -x \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) imap \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) interbase \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) intl \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) json \ && ln -s /usr/lib/x86_64-linux-gnu/libldap* /usr/lib/ \ && /usr/local/bin/docker-php-ext-configure ldap --with-ldap --with-ldap-sasl \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) ldap \ @@ -170,35 +135,25 @@ RUN set -x \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysqli \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) opcache \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pcntl \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo \ && ln -s /usr/lib/x86_64-linux-gnu/libsybdb.* /usr/lib/ \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_dblib \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_firebird \ && /usr/local/bin/docker-php-ext-configure pdo_mysql --with-zlib-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_mysql \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_pgsql \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_sqlite \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pgsql \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) phar \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) posix \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pspell \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) readline \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \ && pecl install redis \ && docker-php-ext-enable redis \ && pecl install rdkafka \ && docker-php-ext-enable rdkafka \ - && /usr/local/bin/docker-php-ext-configure session --with-mm \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) session \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) shmop \ - && /usr/local/bin/docker-php-ext-configure simplexml --with-libxml-dir=/usr \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) simplexml \ && /usr/local/bin/docker-php-ext-configure snmp --with-openssl-dir \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) snmp \ && /usr/local/bin/docker-php-ext-configure soap --with-libxml-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) soap \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sockets \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sodium \ && git clone -v https://github.com/swoole/swoole-src /tmp/swoole \ && cd /tmp/swoole \ && git checkout master \ @@ -241,7 +196,6 @@ RUN set -x \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvsem \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvshm \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) tidy \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) tokenizer \ && git clone -v https://github.com/php/pecl-php-uploadprogress /tmp/uploadprogress \ && cd /tmp/uploadprogress \ && phpize \ @@ -252,23 +206,15 @@ RUN set -x \ && cd / && rm -rf /tmp/uploadprogress \ && /usr/local/bin/docker-php-ext-configure wddx --with-libxml-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) wddx \ - && /usr/local/bin/docker-php-ext-configure xml --with-libxml-dir=/usr \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xml \ && /usr/local/bin/docker-php-ext-configure xmlrpc --with-libxml-dir=/usr --with-iconv-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xmlrpc \ - && /usr/local/bin/docker-php-ext-configure xmlwriter --with-libxml-dir=/usr \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xmlwriter \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xsl \ && /usr/local/bin/docker-php-ext-configure zip --with-zlib-dir=/usr --with-pcre-dir=/usr --with-libzip \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) zip \ \ - \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps \ - ${BUILD_DEPS} \ - \ - \ - && apt-get install --no-install-recommends --no-install-suggests -y \ - ${RUN_DEPS} \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false ${BUILD_DEPS} \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests ${RUN_DEPS} \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ && update-ca-certificates \ && sh -c "find /usr/local -type f -perm /u+x -exec strip --strip-all '{}' + || true" @@ -278,12 +224,21 @@ RUN set -x \ ### Verify ### RUN set -x \ + && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^7.3' \ && /usr/local/sbin/php-fpm --test \ + \ && PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \ - && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi - -RUN set -x \ + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + && PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + \ + && PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && rm -f /usr/local/etc/php/php.ini \ + \ && php -m | grep -oiE '^apcu$' \ && php-fpm -m | grep -oiE '^apcu$' \ && php -m | grep -oiE '^bcmath$' \ @@ -306,6 +261,8 @@ RUN set -x \ && php-fpm -m | grep -oiE '^exif$' \ && php -m | grep -oiE '^fileinfo$' \ && php-fpm -m | grep -oiE '^fileinfo$' \ + && php -m | grep -oiE '^filter$' \ + && php-fpm -m | grep -oiE '^filter$' \ && php -m | grep -oiE '^ftp$' \ && php-fpm -m | grep -oiE '^ftp$' \ && php -m | grep -oiE '^gd$' \ @@ -332,6 +289,10 @@ RUN set -x \ && php-fpm -m | grep -oiE '^json$' \ && php -m | grep -oiE '^ldap$' \ && php-fpm -m | grep -oiE '^ldap$' \ + && php -m | grep -oiE '^libxml$' \ + && php-fpm -m | grep -oiE '^libxml$' \ + && php -m | grep -oiE '^mbstring$' \ + && php-fpm -m | grep -oiE '^mbstring$' \ && php -m | grep -oiE '^mcrypt$' \ && php-fpm -m | grep -oiE '^mcrypt$' \ && php -m | grep -oiE '^memcached$' \ @@ -340,10 +301,16 @@ RUN set -x \ && php-fpm -m | grep -oiE '^mongodb$' \ && php -m | grep -oiE '^mysqli$' \ && php-fpm -m | grep -oiE '^mysqli$' \ + && php -m | grep -oiE '^mysqlnd$' \ + && php-fpm -m | grep -oiE '^mysqlnd$' \ && php -m | grep -oiE '^Zend Opcache$' \ && php-fpm -m | grep -oiE '^Zend Opcache$' \ + && php -m | grep -oiE '^openssl$' \ + && php-fpm -m | grep -oiE '^openssl$' \ && php -m | grep -oiE '^pcntl$' \ && php-fpm -m | grep -oiE '^pcntl$' \ + && php -m | grep -oiE '^pcre$' \ + && php-fpm -m | grep -oiE '^pcre$' \ && php -m | grep -oiE '^pdo$' \ && php-fpm -m | grep -oiE '^pdo$' \ && php -m | grep -oiE '^pdo_dblib$' \ @@ -404,6 +371,8 @@ RUN set -x \ && php-fpm -m | grep -oiE '^wddx$' \ && php -m | grep -oiE '^xml$' \ && php-fpm -m | grep -oiE '^xml$' \ + && php -m | grep -oiE '^xmlreader$' \ + && php-fpm -m | grep -oiE '^xmlreader$' \ && php -m | grep -oiE '^xmlrpc$' \ && php-fpm -m | grep -oiE '^xmlrpc$' \ && php -m | grep -oiE '^xmlwriter$' \ diff --git a/Dockerfiles/prod/Dockerfile-5.2 b/Dockerfiles/prod/Dockerfile-5.2 index f10c2e31..475c6c7f 100644 --- a/Dockerfiles/prod/Dockerfile-5.2 +++ b/Dockerfiles/prod/Dockerfile-5.2 @@ -18,15 +18,16 @@ LABEL \ ### Install ### RUN set -x \ - && apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends --no-install-suggests -y \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ locales-all \ postfix \ postfix-pcre \ rsyslog \ socat \ supervisor \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ \ && rm -rf /etc/supervisor* \ @@ -39,10 +40,20 @@ RUN set -x \ ### Verify ### RUN set -x \ + && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^5.2' \ && /usr/local/sbin/php-fpm --test \ + \ && PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \ - && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + && PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + \ + && PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && rm -f /usr/local/etc/php/php.ini ### diff --git a/Dockerfiles/prod/Dockerfile-5.3 b/Dockerfiles/prod/Dockerfile-5.3 index c518baa9..d25929ad 100644 --- a/Dockerfiles/prod/Dockerfile-5.3 +++ b/Dockerfiles/prod/Dockerfile-5.3 @@ -18,15 +18,16 @@ LABEL \ ### Install ### RUN set -x \ - && apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends --no-install-suggests -y \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ locales-all \ postfix \ postfix-pcre \ rsyslog \ socat \ supervisor \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ \ && rm -rf /etc/supervisor* \ @@ -39,10 +40,20 @@ RUN set -x \ ### Verify ### RUN set -x \ + && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^5.3' \ && /usr/local/sbin/php-fpm --test \ + \ && PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \ - && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + && PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + \ + && PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && rm -f /usr/local/etc/php/php.ini ### diff --git a/Dockerfiles/prod/Dockerfile-5.4 b/Dockerfiles/prod/Dockerfile-5.4 index 8ae68068..3444f793 100644 --- a/Dockerfiles/prod/Dockerfile-5.4 +++ b/Dockerfiles/prod/Dockerfile-5.4 @@ -18,15 +18,16 @@ LABEL \ ### Install ### RUN set -x \ - && apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends --no-install-suggests -y \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ locales-all \ postfix \ postfix-pcre \ rsyslog \ socat \ supervisor \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ \ && rm -rf /etc/supervisor* \ @@ -39,10 +40,20 @@ RUN set -x \ ### Verify ### RUN set -x \ + && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^5.4' \ && /usr/local/sbin/php-fpm --test \ + \ && PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \ - && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + && PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + \ + && PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && rm -f /usr/local/etc/php/php.ini ### diff --git a/Dockerfiles/prod/Dockerfile-5.5 b/Dockerfiles/prod/Dockerfile-5.5 index df204b87..2a1c3349 100644 --- a/Dockerfiles/prod/Dockerfile-5.5 +++ b/Dockerfiles/prod/Dockerfile-5.5 @@ -18,15 +18,16 @@ LABEL \ ### Install ### RUN set -x \ - && apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends --no-install-suggests -y \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ locales-all \ postfix \ postfix-pcre \ rsyslog \ socat \ supervisor \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ \ && rm -rf /etc/supervisor* \ @@ -39,10 +40,20 @@ RUN set -x \ ### Verify ### RUN set -x \ + && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^5.5' \ && /usr/local/sbin/php-fpm --test \ + \ && PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \ - && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + && PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + \ + && PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && rm -f /usr/local/etc/php/php.ini ### diff --git a/Dockerfiles/prod/Dockerfile-5.6 b/Dockerfiles/prod/Dockerfile-5.6 index c9206724..65856788 100644 --- a/Dockerfiles/prod/Dockerfile-5.6 +++ b/Dockerfiles/prod/Dockerfile-5.6 @@ -18,15 +18,16 @@ LABEL \ ### Install ### RUN set -x \ - && apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends --no-install-suggests -y \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ locales-all \ postfix \ postfix-pcre \ rsyslog \ socat \ supervisor \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ \ && rm -rf /etc/supervisor* \ @@ -39,10 +40,20 @@ RUN set -x \ ### Verify ### RUN set -x \ + && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^5.6' \ && /usr/local/sbin/php-fpm --test \ + \ && PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \ - && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + && PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + \ + && PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && rm -f /usr/local/etc/php/php.ini ### diff --git a/Dockerfiles/prod/Dockerfile-7.0 b/Dockerfiles/prod/Dockerfile-7.0 index 6d61515b..fb129fc9 100644 --- a/Dockerfiles/prod/Dockerfile-7.0 +++ b/Dockerfiles/prod/Dockerfile-7.0 @@ -18,15 +18,16 @@ LABEL \ ### Install ### RUN set -x \ - && apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends --no-install-suggests -y \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ locales-all \ postfix \ postfix-pcre \ rsyslog \ socat \ supervisor \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ \ && rm -rf /etc/supervisor* \ @@ -39,10 +40,20 @@ RUN set -x \ ### Verify ### RUN set -x \ + && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^7.0' \ && /usr/local/sbin/php-fpm --test \ + \ && PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \ - && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + && PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + \ + && PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && rm -f /usr/local/etc/php/php.ini ### diff --git a/Dockerfiles/prod/Dockerfile-7.1 b/Dockerfiles/prod/Dockerfile-7.1 index ee4d98bb..cfd73f38 100644 --- a/Dockerfiles/prod/Dockerfile-7.1 +++ b/Dockerfiles/prod/Dockerfile-7.1 @@ -18,15 +18,16 @@ LABEL \ ### Install ### RUN set -x \ - && apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends --no-install-suggests -y \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ locales-all \ postfix \ postfix-pcre \ rsyslog \ socat \ supervisor \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ \ && rm -rf /etc/supervisor* \ @@ -39,10 +40,20 @@ RUN set -x \ ### Verify ### RUN set -x \ + && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^7.1' \ && /usr/local/sbin/php-fpm --test \ + \ && PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \ - && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + && PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + \ + && PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && rm -f /usr/local/etc/php/php.ini ### diff --git a/Dockerfiles/prod/Dockerfile-7.2 b/Dockerfiles/prod/Dockerfile-7.2 index bae41cd0..927b4de8 100644 --- a/Dockerfiles/prod/Dockerfile-7.2 +++ b/Dockerfiles/prod/Dockerfile-7.2 @@ -18,15 +18,16 @@ LABEL \ ### Install ### RUN set -x \ - && apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends --no-install-suggests -y \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ locales-all \ postfix \ postfix-pcre \ rsyslog \ socat \ supervisor \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ \ && rm -rf /etc/supervisor* \ @@ -39,10 +40,20 @@ RUN set -x \ ### Verify ### RUN set -x \ + && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^7.2' \ && /usr/local/sbin/php-fpm --test \ + \ && PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \ - && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + && PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + \ + && PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && rm -f /usr/local/etc/php/php.ini ### diff --git a/Dockerfiles/prod/Dockerfile-7.3 b/Dockerfiles/prod/Dockerfile-7.3 index 7beefbb3..a3600352 100644 --- a/Dockerfiles/prod/Dockerfile-7.3 +++ b/Dockerfiles/prod/Dockerfile-7.3 @@ -18,15 +18,16 @@ LABEL \ ### Install ### RUN set -x \ - && apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends --no-install-suggests -y \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ locales-all \ postfix \ postfix-pcre \ rsyslog \ socat \ supervisor \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ \ && rm -rf /etc/supervisor* \ @@ -39,10 +40,20 @@ RUN set -x \ ### Verify ### RUN set -x \ + && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^7.3' \ && /usr/local/sbin/php-fpm --test \ + \ && PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \ - && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + && PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + \ + && PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && rm -f /usr/local/etc/php/php.ini ### diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2 index 5e526016..512a6a9e 100644 --- a/Dockerfiles/work/Dockerfile-5.2 +++ b/Dockerfiles/work/Dockerfile-5.2 @@ -24,8 +24,9 @@ ENV BASH_PROFILE=".bashrc" ### Install Tools ### RUN set -x \ - && apt-get update \ - && apt-get install --no-install-recommends --no-install-suggests -y \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ dirmngr \ gnupg \ && echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \ @@ -39,8 +40,8 @@ RUN set -x \ && echo "deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \ && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ && echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \ - && apt-get update \ - && apt-get install --no-install-recommends --no-install-suggests -y \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ ack-grep \ aspell \ autoconf \ @@ -100,9 +101,8 @@ RUN set -x \ whois \ wkhtmltopdf \ xz-utils \ - yarn \ zsh \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* @@ -243,10 +243,20 @@ RUN \ ### Verify ### RUN set -x \ + && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^5.2' \ && /usr/local/sbin/php-fpm --test \ + \ && PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \ - && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + && PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + \ + && PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && rm -f /usr/local/etc/php/php.ini RUN set -x \ && ansible --version | grep -E '^ansible [.0-9]+$' \ diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3 index f889ad15..56ec5c73 100644 --- a/Dockerfiles/work/Dockerfile-5.3 +++ b/Dockerfiles/work/Dockerfile-5.3 @@ -24,8 +24,9 @@ ENV BASH_PROFILE=".bashrc" ### Install Tools ### RUN set -x \ - && apt-get update \ - && apt-get install --no-install-recommends --no-install-suggests -y \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ dirmngr \ gnupg \ && echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \ @@ -39,8 +40,8 @@ RUN set -x \ && echo "deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \ && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ && echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \ - && apt-get update \ - && apt-get install --no-install-recommends --no-install-suggests -y \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ ack-grep \ aspell \ autoconf \ @@ -102,7 +103,7 @@ RUN set -x \ xz-utils \ yarn \ zsh \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* @@ -281,10 +282,20 @@ RUN \ ### Verify ### RUN set -x \ + && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^5.3' \ && /usr/local/sbin/php-fpm --test \ + \ && PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \ - && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + && PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + \ + && PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && rm -f /usr/local/etc/php/php.ini RUN set -x \ && composer --version 2>/dev/null | grep -E 'version\s*[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index a23b8663..8351f04c 100644 --- a/Dockerfiles/work/Dockerfile-5.4 +++ b/Dockerfiles/work/Dockerfile-5.4 @@ -24,8 +24,9 @@ ENV BASH_PROFILE=".bashrc" ### Install Tools ### RUN set -x \ - && apt-get update \ - && apt-get install --no-install-recommends --no-install-suggests -y \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ dirmngr \ gnupg \ && echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \ @@ -39,8 +40,8 @@ RUN set -x \ && echo "deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \ && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ && echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \ - && apt-get update \ - && apt-get install --no-install-recommends --no-install-suggests -y \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ ack-grep \ aspell \ autoconf \ @@ -102,7 +103,7 @@ RUN set -x \ xz-utils \ yarn \ zsh \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* @@ -311,10 +312,20 @@ RUN \ ### Verify ### RUN set -x \ + && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^5.4' \ && /usr/local/sbin/php-fpm --test \ + \ && PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \ - && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + && PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + \ + && PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && rm -f /usr/local/etc/php/php.ini RUN set -x \ && composer --version 2>/dev/null | grep -E 'version\s*[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index 31d6ceae..dd4b35e9 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -24,8 +24,9 @@ ENV BASH_PROFILE=".bashrc" ### Install Tools ### RUN set -x \ - && apt-get update \ - && apt-get install --no-install-recommends --no-install-suggests -y \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ dirmngr \ gnupg \ && echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \ @@ -39,8 +40,8 @@ RUN set -x \ && echo "deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \ && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ && echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \ - && apt-get update \ - && apt-get install --no-install-recommends --no-install-suggests -y \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ ack-grep \ aspell \ autoconf \ @@ -102,7 +103,7 @@ RUN set -x \ xz-utils \ yarn \ zsh \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* @@ -322,10 +323,20 @@ RUN \ ### Verify ### RUN set -x \ + && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^5.5' \ && /usr/local/sbin/php-fpm --test \ + \ && PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \ - && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + && PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + \ + && PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && rm -f /usr/local/etc/php/php.ini RUN set -x \ && composer --version 2>/dev/null | grep -E 'version\s*[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index 33cd0c68..fa95a78d 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -24,8 +24,9 @@ ENV BASH_PROFILE=".bashrc" ### Install Tools ### RUN set -x \ - && apt-get update \ - && apt-get install --no-install-recommends --no-install-suggests -y \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ dirmngr \ gnupg \ && echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \ @@ -39,8 +40,8 @@ RUN set -x \ && echo "deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \ && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ && echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \ - && apt-get update \ - && apt-get install --no-install-recommends --no-install-suggests -y \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ ack-grep \ aspell \ autoconf \ @@ -102,7 +103,7 @@ RUN set -x \ xz-utils \ yarn \ zsh \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* @@ -336,10 +337,20 @@ RUN \ ### Verify ### RUN set -x \ + && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^5.6' \ && /usr/local/sbin/php-fpm --test \ + \ && PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \ - && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + && PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + \ + && PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && rm -f /usr/local/etc/php/php.ini RUN set -x \ && composer --version 2>/dev/null | grep -E 'version\s*[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index c3e7d7f0..a8dfb419 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -24,8 +24,9 @@ ENV BASH_PROFILE=".bashrc" ### Install Tools ### RUN set -x \ - && apt-get update \ - && apt-get install --no-install-recommends --no-install-suggests -y \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ dirmngr \ gnupg \ && echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \ @@ -39,8 +40,8 @@ RUN set -x \ && echo "deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \ && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ && echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \ - && apt-get update \ - && apt-get install --no-install-recommends --no-install-suggests -y \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ ack-grep \ aspell \ autoconf \ @@ -102,7 +103,7 @@ RUN set -x \ xz-utils \ yarn \ zsh \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* @@ -336,10 +337,20 @@ RUN \ ### Verify ### RUN set -x \ + && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^7.0' \ && /usr/local/sbin/php-fpm --test \ + \ && PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \ - && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + && PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + \ + && PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && rm -f /usr/local/etc/php/php.ini RUN set -x \ && composer --version 2>/dev/null | grep -E 'version\s*[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index 318b952a..df1a2e1e 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -24,8 +24,9 @@ ENV BASH_PROFILE=".bashrc" ### Install Tools ### RUN set -x \ - && apt-get update \ - && apt-get install --no-install-recommends --no-install-suggests -y \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ dirmngr \ gnupg \ && echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \ @@ -39,8 +40,8 @@ RUN set -x \ && echo "deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \ && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ && echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \ - && apt-get update \ - && apt-get install --no-install-recommends --no-install-suggests -y \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ ack-grep \ aspell \ autoconf \ @@ -102,7 +103,7 @@ RUN set -x \ xz-utils \ yarn \ zsh \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* @@ -336,10 +337,20 @@ RUN \ ### Verify ### RUN set -x \ + && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^7.1' \ && /usr/local/sbin/php-fpm --test \ + \ && PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \ - && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + && PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + \ + && PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && rm -f /usr/local/etc/php/php.ini RUN set -x \ && composer --version 2>/dev/null | grep -E 'version\s*[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index 9faab88e..fbd7178a 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -24,8 +24,9 @@ ENV BASH_PROFILE=".bashrc" ### Install Tools ### RUN set -x \ - && apt-get update \ - && apt-get install --no-install-recommends --no-install-suggests -y \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ dirmngr \ gnupg \ && echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \ @@ -39,8 +40,8 @@ RUN set -x \ && echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" > /etc/apt/sources.list.d/pgsql.list \ && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ && echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \ - && apt-get update \ - && apt-get install --no-install-recommends --no-install-suggests -y \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ ack-grep \ aspell \ autoconf \ @@ -102,7 +103,7 @@ RUN set -x \ xz-utils \ yarn \ zsh \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* @@ -336,10 +337,20 @@ RUN \ ### Verify ### RUN set -x \ + && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^7.2' \ && /usr/local/sbin/php-fpm --test \ + \ && PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \ - && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + && PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + \ + && PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && rm -f /usr/local/etc/php/php.ini RUN set -x \ && composer --version 2>/dev/null | grep -E 'version\s*[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index 05114b4f..c71812e2 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -24,8 +24,9 @@ ENV BASH_PROFILE=".bashrc" ### Install Tools ### RUN set -x \ - && apt-get update \ - && apt-get install --no-install-recommends --no-install-suggests -y \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ dirmngr \ gnupg \ && echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \ @@ -39,8 +40,8 @@ RUN set -x \ && echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" > /etc/apt/sources.list.d/pgsql.list \ && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ && echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \ - && apt-get update \ - && apt-get install --no-install-recommends --no-install-suggests -y \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ ack-grep \ aspell \ autoconf \ @@ -102,7 +103,7 @@ RUN set -x \ xz-utils \ yarn \ zsh \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* @@ -325,10 +326,20 @@ RUN \ ### Verify ### RUN set -x \ + && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^7.3' \ && /usr/local/sbin/php-fpm --test \ + \ && PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \ - && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + && PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + \ + && PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && rm -f /usr/local/etc/php/php.ini RUN set -x \ && composer --version 2>/dev/null | grep -E 'version\s*[.0-9]+' \ diff --git a/build/ansible/DOCKERFILES/Dockerfile-base.j2 b/build/ansible/DOCKERFILES/Dockerfile-base.j2 index 4253891f..5613dcd5 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-base.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-base.j2 @@ -44,9 +44,8 @@ RUN set -x \ ### Upgrade (install ps) ### RUN set -x \ - && apt-get update \ - && apt-get upgrade -y \ - && apt-get install --no-install-recommends --no-install-suggests -y procps \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \ && rm -rf /var/lib/apt/lists/* @@ -77,10 +76,20 @@ COPY ./data/docker-entrypoint.d /docker-entrypoint.d ### Verify ### RUN set -x \ + && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^{{ php_version }}' \ && /usr/local/sbin/php-fpm --test \ + \ && PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \ - && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + && PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + \ + && PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && rm -f /usr/local/etc/php/php.ini {% endif %} diff --git a/build/ansible/DOCKERFILES/Dockerfile-mods.j2 b/build/ansible/DOCKERFILES/Dockerfile-mods.j2 index a1ae34be..53fce99a 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-mods.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-mods.j2 @@ -18,43 +18,56 @@ LABEL \ ### Envs ### ENV BUILD_DEPS \ -{# Loop over enabled build dependencies #} -{% for ext in extensions_enabled %} -{# Not disabled #} -{% if ('disabled' not in extensions_available[ext]) or (php_version not in extensions_available[ext]['disabled']) %} -{# Version specific build dependency available? #} -{% if php_version in extensions_available[ext] and 'build_dep' in extensions_available[ext][php_version] %} -{% for build_dep in extensions_available[ext][php_version]['build_dep'] %} - {{ build_dep }} \ -{% endfor %} -{# Generic build dependency available? #} -{% elif 'all' in extensions_available[ext] and 'build_dep' in extensions_available[ext]['all'] %} -{% for build_dep in extensions_available[ext]['all']['build_dep'] %} +{# Loop over enabled build dependencies -#} +{%- set build_deps = [] -%} +{%- for ext in extensions_enabled -%} + {#- Not disabled AND not already available by default -#} + {%- if (('disabled' not in extensions_available[ext]) or (php_version not in extensions_available[ext]['disabled'])) + and ('already_avail' not in extensions_available[ext] or php_version not in extensions_available[ext]['already_avail']) -%} + {#- Version specific build dependency available? -#} + {%- if php_version in extensions_available[ext] and 'build_dep' in extensions_available[ext][php_version] -%} + {%- for build_dep in extensions_available[ext][php_version]['build_dep'] -%} + {#- Append build dependencies to our array -#} + {{- build_deps.append(build_dep) -}} + {%- endfor -%} + {#- Generic build dependency available? -#} + {%- elif 'all' in extensions_available[ext] and 'build_dep' in extensions_available[ext]['all'] -%} + {%- for build_dep in extensions_available[ext]['all']['build_dep'] -%} + {#- Append build dependencies to our array -#} + {{- build_deps.append(build_dep) -}} + {%- endfor -%} + {%- endif -%} + {%- endif -%} +{%- endfor -%} +{% for build_dep in build_deps | unique | sort %} {{ build_dep }} \ -{% endfor %} -{% endif %} -{% endif %} {% endfor %} ca-certificates \ git ENV RUN_DEPS \ -{# Loop over enabled run-time dependencies #} -{% for ext in extensions_enabled %} -{# Not disabled #} -{% if ('disabled' not in extensions_available[ext]) or (php_version not in extensions_available[ext]['disabled']) %} -{# Version specific run-time dependency available? #} -{% if php_version in extensions_available[ext] and 'run_dep' in extensions_available[ext][php_version] %} -{% for run_dep in extensions_available[ext][php_version]['run_dep'] %} - {{ run_dep }} \ -{% endfor %} -{# Generic run-time dependency available? #} -{% elif 'all' in extensions_available[ext] and 'run_dep' in extensions_available[ext]['all'] %} -{% for run_dep in extensions_available[ext]['all']['run_dep'] %} +{# Loop over enabled run-time dependencies -#} +{%- set run_deps = [] -%} +{%- for ext in extensions_enabled -%} + {#- Not disabled -#} + {%- if ('disabled' not in extensions_available[ext]) or (php_version not in extensions_available[ext]['disabled']) -%} + {#- Version specific run-time dependency available? -#} + {%- if php_version in extensions_available[ext] and 'run_dep' in extensions_available[ext][php_version] -%} + {%- for run_dep in extensions_available[ext][php_version]['run_dep'] -%} + {#- Append run dependencies to our array -#} + {{- run_deps.append(run_dep) -}} + {%- endfor -%} + {#- Generic run-time dependency available? -#} + {%- elif 'all' in extensions_available[ext] and 'run_dep' in extensions_available[ext]['all'] -%} + {%- for run_dep in extensions_available[ext]['all']['run_dep'] -%} + {#- Append run dependencies to our array -#} + {{- run_deps.append(run_dep) -}} + {%- endfor -%} + {%- endif -%} + {%- endif -%} +{%- endfor -%} +{% for run_dep in run_deps | unique | sort %} {{ run_dep }} \ -{% endfor %} -{% endif %} -{% endif %} {% endfor %} ca-certificates @@ -63,108 +76,113 @@ ENV RUN_DEPS \ ### Install ### RUN set -x \ - && apt-get update \ - && apt-get install --no-install-recommends --no-install-suggests -y \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ ${BUILD_DEPS} \ \ \ {# Loop over enabled extensions #} {% for ext in extensions_enabled %} -{# Not disabled #} -{% if ('disabled' not in extensions_available[ext]) or (php_version not in extensions_available[ext]['disabled']) %} -{# ---------- Pre Command ---------- #} -{# Version specific pre-command available? #} -{% if php_version in extensions_available[ext] and 'pre' in extensions_available[ext][php_version] %} +{# Not disabled AND not already enabled #} +{% if (('disabled' not in extensions_available[ext]) or (php_version not in extensions_available[ext]['disabled'])) and ('already_avail' not in extensions_available[ext] or php_version not in extensions_available[ext]['already_avail']) %} +{# ---------- Pre Command ---------- #} +{# Version specific pre-command available? #} +{% if php_version in extensions_available[ext] and 'pre' in extensions_available[ext][php_version] %} && {{ extensions_available[ext][php_version]['pre'] }} \ -{# Generic pre-command available? #} -{% elif 'all' in extensions_available[ext] and 'pre' in extensions_available[ext]['all'] %} +{# Generic pre-command available? #} +{% elif 'all' in extensions_available[ext] and 'pre' in extensions_available[ext]['all'] %} && {{ extensions_available[ext]['all']['pre'] }} \ -{% endif %} -{# ---------- Installation (specific) ---------- #} -{% if php_version in extensions_available[ext] and 'type' in extensions_available[ext][php_version] %} -{# ---- 1.) Builtin ---- #} -{% if extensions_available[ext][php_version]['type'] == 'builtin' %} -{% if 'configure' in extensions_available[ext][php_version] %} +{% endif %} +{# ---------- Installation (specific) ---------- #} +{% if php_version in extensions_available[ext] and 'type' in extensions_available[ext][php_version] %} +{# ---- 1.) Builtin ---- #} +{% if extensions_available[ext][php_version]['type'] == 'builtin' %} +{% if 'configure' in extensions_available[ext][php_version] %} && /usr/local/bin/docker-php-ext-configure {{ ext }} {{ extensions_available[ext][php_version]['configure'] }} \ -{% endif %} +{% endif %} && /usr/local/bin/docker-php-ext-install{% if php_version != 5.4 %} -j$(getconf _NPROCESSORS_ONLN){% endif %} {{ ext }} \ -{# ---- 2.) PECL ---- #} -{% elif extensions_available[ext][php_version]['type'] == 'pecl' %} -{% if 'command' in extensions_available[ext][php_version] %} +{# ---- 2.) PECL ---- #} +{% elif extensions_available[ext][php_version]['type'] == 'pecl' %} +{% if 'command' in extensions_available[ext][php_version] %} && {{ extensions_available[ext][php_version]['command'] }} \ -{% else %} +{% else %} && pecl install {{ ext }}{% if 'version' in extensions_available[ext][php_version] %}-{{ extensions_available[ext][php_version]['version'] }}{% endif %} \ -{% endif %} +{% endif %} && docker-php-ext-enable {{ ext }} \ -{# ---- 3.) GIT ---- #} -{% elif extensions_available[ext][php_version]['type'] == 'git' %} +{# ---- 3.) GIT ---- #} +{% elif extensions_available[ext][php_version]['type'] == 'git' %} && git clone -v {{ extensions_available[ext][php_version]['git_url'] }} /tmp/{{ ext }} \ && cd /tmp/{{ ext }} \ -{% if 'git_ref' in extensions_available[ext][php_version] %} +{% if 'git_ref' in extensions_available[ext][php_version] %} && git checkout {{ extensions_available[ext][php_version]['git_ref'] }} \ -{% endif %} -{% if 'command' in extensions_available[ext][php_version] %} +{% endif %} +{% if 'command' in extensions_available[ext][php_version] %} && {{ extensions_available[ext][php_version]['command'] }} \ -{% else %} +{% else %} && phpize \ && ./configure {% if 'configure' in extensions_available[ext][php_version] %} {{ extensions_available[ext][php_version]['configure'] }}{% endif %} \ && make -j$(getconf _NPROCESSORS_ONLN) \ && make install \ -{% endif %} +{% endif %} && docker-php-ext-enable {{ ext }} \ && cd / && rm -rf /tmp/{{ ext }} \ -{# ---- 4.) CUSTOM ---- #} -{% elif extensions_available[ext][php_version]['type'] == 'custom' %} +{# ---- 4.) CUSTOM ---- #} +{% elif extensions_available[ext][php_version]['type'] == 'custom' %} && {{ extensions_available[ext][php_version]['command'] }} \ -{% endif %} -{# ---------- Installation (generic) ---------- #} -{% elif 'all' in extensions_available[ext] and 'type' in extensions_available[ext]['all'] %} -{# ---- 1.) Builtin ---- #} -{% if extensions_available[ext]['all']['type'] == 'builtin' %} -{% if 'configure' in extensions_available[ext]['all'] %} +{% endif %} +{# ---------- Installation (generic) ---------- #} +{% elif 'all' in extensions_available[ext] and 'type' in extensions_available[ext]['all'] %} +{# ---- 1.) Builtin ---- #} +{% if extensions_available[ext]['all']['type'] == 'builtin' %} +{% if 'configure' in extensions_available[ext]['all'] %} && /usr/local/bin/docker-php-ext-configure {{ ext }} {{ extensions_available[ext]['all']['configure'] }} \ -{% endif %} +{% endif %} && /usr/local/bin/docker-php-ext-install{% if php_version != 5.4 %} -j$(getconf _NPROCESSORS_ONLN){% endif %} {{ ext }} \ -{# ---- 2.) PECL ---- #} -{% elif extensions_available[ext]['all']['type'] == 'pecl' %} -{% if 'command' in extensions_available[ext]['all'] %} +{# ---- 2.) PECL ---- #} +{% elif extensions_available[ext]['all']['type'] == 'pecl' %} +{% if 'command' in extensions_available[ext]['all'] %} && {{ extensions_available[ext]['all']['command'] }} \ -{% else %} +{% else %} && pecl install {{ ext }}{% if 'version' in extensions_available[ext]['all'] %}-{{ extensions_available[ext]['all']['version'] }}{% endif %} \ -{% endif %} +{% endif %} && docker-php-ext-enable {{ ext }} \ -{# ---- 3.) GIT ---- #} -{% elif extensions_available[ext]['all']['type'] == 'git' %} +{# ---- 3.) GIT ---- #} +{% elif extensions_available[ext]['all']['type'] == 'git' %} && git clone -v {{ extensions_available[ext]['all']['git_url'] }} /tmp/{{ ext }} \ && cd /tmp/{{ ext }} \ -{% if 'git_ref' in extensions_available[ext]['all'] %} +{% if 'git_ref' in extensions_available[ext]['all'] %} && git checkout {{ extensions_available[ext]['all']['git_ref'] }} \ -{% endif %} -{% if 'command' in extensions_available[ext]['all'] %} +{% endif %} +{% if 'command' in extensions_available[ext]['all'] %} && {{ extensions_available[ext]['all']['command'] }} \ -{% else %} +{% else %} && phpize \ && ./configure {% if 'configure' in extensions_available[ext]['all'] %} {{ extensions_available[ext]['all']['configure'] }}{% endif %} \ && make -j$(getconf _NPROCESSORS_ONLN) \ && make install \ -{% endif %} +{% endif %} && docker-php-ext-enable {{ ext }} \ && cd / && rm -rf /tmp/{{ ext }} \ -{# ---- 4.) CUSTOM ---- #} -{% elif extensions_available[ext]['all']['type'] == 'custom' %} +{# ---- 4.) CUSTOM ---- #} +{% elif extensions_available[ext]['all']['type'] == 'custom' %} && {{ extensions_available[ext]['all']['command'] }} \ -{% endif %} -{% endif %} -{% endif %} +{% endif %} +{% endif %} +{% endif %} +{# Ensure modules that are not disabled have an appropriate ini directive and are loaded #} +{% if ('disabled' not in extensions_available[ext]) or (php_version not in extensions_available[ext]['disabled']) %} +{% if php_version in extensions_available[ext] and 'load_ext' in extensions_available[ext][php_version] %} + && if [ ! -f "/usr/local/etc/php/conf.d/docker-php-ext-{{ ext }}.ini" ]; then echo "extension={{ extensions_available[ext][php_version]['load_ext'] }}" > "/usr/local/etc/php/conf.d/docker-php-ext-{{ ext }}.ini"; fi \ +{% elif 'all' in extensions_available[ext] and 'load_ext' in extensions_available[ext]['all'] %} + && if [ ! -f "/usr/local/etc/php/conf.d/docker-php-ext-{{ ext }}.ini" ]; then echo "extenstion={{ extensions_available[ext]['all']['load_ext'] }}" > "/usr/local/etc/php/conf.d/docker-php-ext-{{ ext }}.ini"; fi \ +{% endif %} +{% endif %} {% endfor %} \ - \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps \ - ${BUILD_DEPS} \ - \ - \ - && apt-get install --no-install-recommends --no-install-suggests -y \ - ${RUN_DEPS} \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false ${BUILD_DEPS} \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests ${RUN_DEPS} \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ && update-ca-certificates \ && sh -c "find /usr/local -type f -perm /u+x -exec strip --strip-all '{}' + || true" @@ -175,25 +193,34 @@ RUN set -x \ ### Verify ### RUN set -x \ + && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^{{ php_version }}' \ && /usr/local/sbin/php-fpm --test \ + \ && PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \ - && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi - -RUN set -x \ + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + && PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + \ + && PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && rm -f /usr/local/etc/php/php.ini \ + \ {% for ext in extensions_enabled %} -{# Not disabled #} -{% if ('disabled' not in extensions_available[ext]) or (php_version not in extensions_available[ext]['disabled']) %} -{% if ext == 'opcache' %} + {#- Not disabled #} + {%- if ('disabled' not in extensions_available[ext]) or (php_version not in extensions_available[ext]['disabled']) %} + {%- if ext == 'opcache' %} && php -m | grep -oiE '^Zend Opcache$' \ && php-fpm -m | grep -oiE '^Zend Opcache$' \ -{% elif ext == 'ioncube' %} -{# Not enabled #} -{% else %} +{# #} + {%- elif ext not in ['ioncube'] %} && php -m | grep -oiE '^{{ ext }}$' \ && php-fpm -m | grep -oiE '^{{ ext }}$' \ -{% endif %} -{% endif %} +{# #} + {%- endif %} + {%- endif %} {% endfor %} && true diff --git a/build/ansible/DOCKERFILES/Dockerfile-prod.j2 b/build/ansible/DOCKERFILES/Dockerfile-prod.j2 index 95bb84a8..572cb0ba 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-prod.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-prod.j2 @@ -18,15 +18,16 @@ LABEL \ ### Install ### RUN set -x \ - && apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends --no-install-suggests -y \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ locales-all \ postfix \ postfix-pcre \ rsyslog \ socat \ supervisor \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ \ && rm -rf /etc/supervisor* \ @@ -40,10 +41,20 @@ RUN set -x \ ### Verify ### RUN set -x \ + && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^{{ php_version }}' \ && /usr/local/sbin/php-fpm --test \ + \ && PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \ - && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + && PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + \ + && PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && rm -f /usr/local/etc/php/php.ini {% endif %} diff --git a/build/ansible/DOCKERFILES/Dockerfile-work.j2 b/build/ansible/DOCKERFILES/Dockerfile-work.j2 index 9a1baea3..b6182ea4 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-work.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-work.j2 @@ -24,38 +24,45 @@ ENV BASH_PROFILE=".bashrc" ### Install Tools ### RUN set -x \ - && apt-get update \ - && apt-get install --no-install-recommends --no-install-suggests -y \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ dirmngr \ gnupg \ -{% for repo in apt_repositories_enabled %} -{# Not disabled #} -{% if ('disabled' not in apt_repositories_available[repo]) or (php_version not in apt_repositories_available[repo]['disabled']) %} -{# Version specific pre-command available? #} -{% if php_version in apt_repositories_available[repo] and 'pre' in apt_repositories_available[repo][php_version] %} +{% for repo in apt_repositories_enabled -%} + {#- Not disabled -#} + {%- if ('disabled' not in apt_repositories_available[repo]) or (php_version not in apt_repositories_available[repo]['disabled']) -%} + {#- Version specific pre-command available? -#} + {%- if php_version in apt_repositories_available[repo] and 'pre' in apt_repositories_available[repo][php_version] %} && {{ apt_repositories_available[repo][php_version]['pre'] }} \ -{# Generic pre-command available? #} -{% elif 'all' in apt_repositories_available[repo] and 'pre' in apt_repositories_available[repo]['all'] %} +{# #} + {#- Generic pre-command available? -#} + {%- elif 'all' in apt_repositories_available[repo] and 'pre' in apt_repositories_available[repo]['all'] %} && {{ apt_repositories_available[repo]['all']['pre'] }} \ -{% endif %} -{# Version specific key available? #} -{% if php_version in apt_repositories_available[repo] and 'key' in apt_repositories_available[repo][php_version] %} +{# #} + {%- endif -%} + {#- Version specific key available? -#} + {%- if php_version in apt_repositories_available[repo] and 'key' in apt_repositories_available[repo][php_version] %} && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv {{ apt_repositories_available[repo][php_version]['key'] }} \ -{# Generic key available? #} -{% elif 'all' in apt_repositories_available[repo] and 'key' in apt_repositories_available[repo]['all'] %} +{# #} + {#- Generic key available? -#} + {%- elif 'all' in apt_repositories_available[repo] and 'key' in apt_repositories_available[repo]['all'] %} && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv {{ apt_repositories_available[repo]['all']['key'] }} \ -{% endif %} -{# Version specific repository available? #} -{% if php_version in apt_repositories_available[repo] and 'deb' in apt_repositories_available[repo][php_version] %} +{# #} + {%- endif -%} + {#- Version specific repository available? -#} + {%- if php_version in apt_repositories_available[repo] and 'deb' in apt_repositories_available[repo][php_version] %} && echo "{{ apt_repositories_available[repo][php_version]['deb'] }}" > /etc/apt/sources.list.d/{{ repo }}.list \ -{# Generic repository available? #} -{% else %} +{# #} + {#- Generic repository available? -#} + {%- else %} && echo "{{ apt_repositories_available[repo]['all']['deb'] }}" > /etc/apt/sources.list.d/{{ repo }}.list \ -{% endif %} -{% endif %} -{% endfor %} - && apt-get update \ - && apt-get install --no-install-recommends --no-install-suggests -y \ +{# #} + {%- endif -%} + {%- endif -%} +{%- endfor %} + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ ack-grep \ aspell \ autoconf \ @@ -115,9 +122,11 @@ RUN set -x \ whois \ wkhtmltopdf \ xz-utils \ +{% if php_version != 5.2 %} yarn \ +{% endif %} zsh \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* @@ -177,10 +186,20 @@ RUN \ ### Verify ### RUN set -x \ + && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^{{ php_version }}' \ && /usr/local/sbin/php-fpm --test \ + \ && PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \ - && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + && PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \ + \ + && PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \ + && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ + && rm -f /usr/local/etc/php/php.ini RUN set -x \ {% for tool in software_enabled %} diff --git a/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml index 306b0f46..37c71d64 100644 --- a/build/ansible/group_vars/all.yml +++ b/build/ansible/group_vars/all.yml @@ -740,26 +740,28 @@ extensions_enabled: ### # all: is generic version of defines # 7.2: is specific version of defines -# disabled: [optional] Array of PHP versions for which to disable this module +# disabled: [optional] Array of PHP versions for which to disable this module +# already_avail: [optional] Array of PHP versions for which we don't install the module, but +# the dependencies, as it is already loaded by core # # all, 7.2, 7.1, 7.0, 5.6, 5.5, 5.4: -# pre: [optional] Run command before anything else -# build_dep: [optional] Array of build dependencies -# run_dep: [optional] Array of run-time dependencies -# type: [required] One of 'builtin', 'pecl' or 'git' +# pre: [optional] Run command before anything else +# build_dep: [optional] Array of build dependencies +# run_dep: [optional] Array of run-time dependencies +# type: [required] One of 'builtin', 'pecl' or 'git' # # type: builtin -# configure: [optional] Add './configure' arguments +# configure: [optional] Add './configure' arguments # type: pecl -# version: [optional] Pecl packet version -# command: [optional] Overwrite pecl command (pecl install ext) +# version: [optional] Pecl packet version +# command: [optional] Overwrite pecl command (pecl install ext) # type: git -# git_url: [required] Git repository URL -# git_ref: [optional] Tag, branch, commit to checkout -# configure: [optional] Add './configure' arguments -# command: [optional] Overwrite default command (phpize && ./configure && make && make install) +# git_url: [required] Git repository URL +# git_ref: [optional] Tag, branch, commit to checkout +# configure: [optional] Add './configure' arguments +# command: [optional] Overwrite default command (phpize && ./configure && make && make install) # type: custom -# command: [required] Custom command to install and enable a module +# command: [required] Custom command to install and enable a module extensions_available: amqp: disabled: [7.3] @@ -805,9 +807,11 @@ extensions_available: all: type: builtin ctype: + already_avail: [5.2, 5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3] all: type: builtin curl: + already_avail: [5.2, 5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3] all: type: builtin build_dep: [libcurl4-openssl-dev] @@ -815,6 +819,7 @@ extensions_available: all: type: builtin dom: + already_avail: [5.2, 5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3] all: type: builtin configure: --with-libxml-dir=/usr @@ -831,14 +836,16 @@ extensions_available: all: type: builtin fileinfo: + already_avail: [5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3] 5.2: type: pecl build_dep: [libmagic-dev] all: type: builtin filter: - disabled: "{{ php_all_versions }}" # Available by default + already_avail: "{{ php_all_versions }}" # Available by default ftp: + already_avail: [5.5, 5.6, 7.0, 7.1, 7.2, 7.3] all: type: builtin configure: --with-openssl-dir @@ -905,12 +912,17 @@ extensions_available: pre: ln /usr/include/x86_64-linux-gnu/gmp.h /usr/include/ build_dep: [libgmp-dev] hash: + already_avail: [5.2, 5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3] all: type: builtin iconv: + already_avail: [5.2, 5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3] all: type: builtin igbinary: + 5.2: + type: pecl + version: 2.0.7 all: type: pecl imagick: @@ -973,6 +985,7 @@ extensions_available: && rm -rf ioncube \ && rm -rf ioncube.tar.gz \ json: + already_avail: [5.2, 5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3] 7.0: type: builtin build_dep: [bison] @@ -985,9 +998,9 @@ extensions_available: configure: --with-ldap --with-ldap-sasl build_dep: [libldap2-dev, libsasl2-dev] libxml: - disabled: "{{ php_all_versions }}" # Available by default + already_avail: "{{ php_all_versions }}" # Available by default mbstring: - disabled: [7.3] + already_avail: [5.2, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3] all: type: builtin mcrypt: @@ -1083,6 +1096,7 @@ extensions_available: all: type: pecl mysql: + already_avail: [5.2, 5.3] disabled: [7.0, 7.1, 7.2, 7.3] # Deprecated in newer versions 5.6: type: builtin @@ -1091,10 +1105,12 @@ extensions_available: type: builtin run_dep: [libmysqlclient18] mysqli: + already_avail: [5.2] all: type: builtin mysqlnd: - disabled: "{{ php_all_versions }}" # Available by default + disabled: [5.2] + already_avail: [5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3] oci8: disabled: "{{ php_all_versions }}" # TODO: Oracle library is missing odbc: @@ -1112,15 +1128,16 @@ extensions_available: all: type: builtin openssl: - disabled: "{{ php_all_versions }}" # Available by default + already_avail: "{{ php_all_versions }}" # Available by default pcntl: all: type: builtin pcre: - disabled: "{{ php_all_versions }}" # Available by default + already_avail: "{{ php_all_versions }}" # Available by default pdo: # https://github.com/docker-library/php/issues/618 - disabled: [7.0] # TODO: Currently disabled due to bug in built + #disabled: [7.0] # TODO: Currently disabled due to bug in built + already_avail: [5.2, 5.3, 5.4, 5.5, 5.6, 7.1, 7.2, 7.3] all: type: builtin pdo_dblib: @@ -1135,12 +1152,16 @@ extensions_available: build_dep: [libfbclient2, libib-util, firebird-dev] run_dep: [libfbclient2] pdo_mysql: + already_avail: [5.2] all: type: builtin configure: --with-zlib-dir=/usr build_dep: [zlib1g-dev] pdo_oci: disabled: "{{ php_all_versions }}" # TODO: Oracle library is missing + # disabled: [5.2] + # all: + # type: builtin pdo_odbc: disabled: "{{ php_all_versions }}" # TODO: Build errors pdo_pgsql: @@ -1149,6 +1170,7 @@ extensions_available: build_dep: [libpq-dev] run_dep: [libpq5] pdo_sqlite: + already_avail: [5.2, 5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3] all: type: builtin build_dep: [libsqlite3-dev] @@ -1183,12 +1205,14 @@ extensions_available: phar: # https://github.com/docker-library/php/issues/618 disabled: [5.6, 7.0] # TODO: Currently disabled due to bug in built + already_avail: [5.3, 5.4, 5.5, 7.1, 7.2, 7.3] 5.2: type: pecl all: type: builtin build_dep: [libssl-dev] posix: + already_avail: [5.2, 5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3] all: type: builtin pspell: @@ -1197,11 +1221,13 @@ extensions_available: build_dep: [libpspell-dev] run_dep: [libaspell15] readline: - disabled: [5.2, 5.3, 5.4] # Available by default + disabled: [5.3] + already_avail: [5.2, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3] all: type: builtin build_dep: [libedit-dev, libreadline-dev] recode: + already_avail: [5.3, 5.4] all: type: builtin build_dep: [librecode-dev] @@ -1219,6 +1245,7 @@ extensions_available: build_dep: [librdkafka-dev] run_dep: [librdkafka1] session: + already_avail: [5.2, 5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3] all: type: builtin configure: --with-mm @@ -1227,6 +1254,7 @@ extensions_available: all: type: builtin simplexml: + already_avail: [5.2, 5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3] all: type: builtin configure: --with-libxml-dir=/usr @@ -1238,6 +1266,7 @@ extensions_available: build_dep: [libssl-dev, libsnmp-dev, snmp] run_dep: [snmp] soap: + already_avail: [5.2] all: type: builtin configure: --with-libxml-dir=/usr @@ -1247,6 +1276,7 @@ extensions_available: type: builtin sodium: disabled: [5.2, 5.3, 5.4, 5.5, 5.6, 7.0, 7.1] + already_avail: [7.2, 7.3] all: type: builtin build_dep: [libsodium-dev] @@ -1342,6 +1372,7 @@ extensions_available: build_dep: [libtidy-dev] run_dep: [libtidy5] tokenizer: + already_avail: [5.2, 5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3] all: type: builtin uploadprogress: @@ -1388,12 +1419,13 @@ extensions_available: all: type: pecl xml: + already_avail: [5.2, 5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3] all: type: builtin configure: --with-libxml-dir=/usr build_dep: [libxml2-dev] xmlreader: - disabled: [7.0, 7.1, 7.2, 7.3] # Available by default + already_avail: [5.2, 5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3] all: type: builtin configure: --with-libxml-dir=/usr @@ -1404,6 +1436,7 @@ extensions_available: configure: --with-libxml-dir=/usr --with-iconv-dir=/usr build_dep: [libxml2-dev] xmlwriter: + already_avail: [5.2, 5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3] all: type: builtin configure: --with-libxml-dir=/usr From a9fc2a95a1d84d0389b9f62edc3eb80735c82312 Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 1 Nov 2018 09:53:23 +0100 Subject: [PATCH 2/6] Fix drush9 installation --- Dockerfiles/work/Dockerfile-5.2 | 1 + Dockerfiles/work/Dockerfile-5.3 | 1 - Dockerfiles/work/Dockerfile-5.4 | 2 -- Dockerfiles/work/Dockerfile-5.5 | 2 -- Dockerfiles/work/Dockerfile-5.6 | 3 --- Dockerfiles/work/Dockerfile-7.0 | 3 --- Dockerfiles/work/Dockerfile-7.1 | 3 --- Dockerfiles/work/Dockerfile-7.2 | 3 --- Dockerfiles/work/Dockerfile-7.3 | 3 --- build/ansible/DOCKERFILES/Dockerfile-work.j2 | 2 -- build/ansible/group_vars/all.yml | 3 --- 11 files changed, 1 insertion(+), 25 deletions(-) diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2 index 512a6a9e..b357b14b 100644 --- a/Dockerfiles/work/Dockerfile-5.2 +++ b/Dockerfiles/work/Dockerfile-5.2 @@ -101,6 +101,7 @@ RUN set -x \ whois \ wkhtmltopdf \ xz-utils \ + yarn \ zsh \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3 index 56ec5c73..b3c336cf 100644 --- a/Dockerfiles/work/Dockerfile-5.3 +++ b/Dockerfiles/work/Dockerfile-5.3 @@ -147,7 +147,6 @@ RUN set -x \ && rm -rf /usr/local/src/drush7/docs \ && rm -rf /usr/local/src/drush7/examples \ && rm -rf /usr/local/src/drush7/misc \ -&& rm -rf /usr/local/src/drush7/tests \ \ # gitflow && git clone git://github.com/petervanderdoes/gitflow.git /tmp/gitflow \ diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index 8351f04c..2a5dce26 100644 --- a/Dockerfiles/work/Dockerfile-5.4 +++ b/Dockerfiles/work/Dockerfile-5.4 @@ -150,7 +150,6 @@ RUN set -x \ && rm -rf /usr/local/src/drush7/docs \ && rm -rf /usr/local/src/drush7/examples \ && rm -rf /usr/local/src/drush7/misc \ -&& rm -rf /usr/local/src/drush7/tests \ \ # drush8 && git clone https://github.com/drush-ops/drush.git /usr/local/src/drush8 \ @@ -164,7 +163,6 @@ RUN set -x \ && rm -rf /usr/local/src/drush8/docs \ && rm -rf /usr/local/src/drush8/examples \ && rm -rf /usr/local/src/drush8/misc \ -&& rm -rf /usr/local/src/drush8/tests \ \ # gitflow && git clone git://github.com/petervanderdoes/gitflow.git /tmp/gitflow \ diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index dd4b35e9..21af6b1d 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -154,7 +154,6 @@ RUN set -x \ && rm -rf /usr/local/src/drush7/docs \ && rm -rf /usr/local/src/drush7/examples \ && rm -rf /usr/local/src/drush7/misc \ -&& rm -rf /usr/local/src/drush7/tests \ \ # drush8 && git clone https://github.com/drush-ops/drush.git /usr/local/src/drush8 \ @@ -168,7 +167,6 @@ RUN set -x \ && rm -rf /usr/local/src/drush8/docs \ && rm -rf /usr/local/src/drush8/examples \ && rm -rf /usr/local/src/drush8/misc \ -&& rm -rf /usr/local/src/drush8/tests \ \ # drupalconsole && curl https://drupalconsole.com/installer -L -o /usr/local/bin/drupal \ diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index fa95a78d..b89c2dc3 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -154,7 +154,6 @@ RUN set -x \ && rm -rf /usr/local/src/drush7/docs \ && rm -rf /usr/local/src/drush7/examples \ && rm -rf /usr/local/src/drush7/misc \ -&& rm -rf /usr/local/src/drush7/tests \ \ # drush8 && git clone https://github.com/drush-ops/drush.git /usr/local/src/drush8 \ @@ -168,7 +167,6 @@ RUN set -x \ && rm -rf /usr/local/src/drush8/docs \ && rm -rf /usr/local/src/drush8/examples \ && rm -rf /usr/local/src/drush8/misc \ -&& rm -rf /usr/local/src/drush8/tests \ \ # drush9 && git clone https://github.com/drush-ops/drush.git /usr/local/src/drush9 \ @@ -182,7 +180,6 @@ RUN set -x \ && rm -rf /usr/local/src/drush9/docs \ && rm -rf /usr/local/src/drush9/examples \ && rm -rf /usr/local/src/drush9/misc \ -&& rm -rf /usr/local/src/drush9/tests \ \ # drupalconsole && curl https://drupalconsole.com/installer -L -o /usr/local/bin/drupal \ diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index a8dfb419..671f6d54 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -154,7 +154,6 @@ RUN set -x \ && rm -rf /usr/local/src/drush7/docs \ && rm -rf /usr/local/src/drush7/examples \ && rm -rf /usr/local/src/drush7/misc \ -&& rm -rf /usr/local/src/drush7/tests \ \ # drush8 && git clone https://github.com/drush-ops/drush.git /usr/local/src/drush8 \ @@ -168,7 +167,6 @@ RUN set -x \ && rm -rf /usr/local/src/drush8/docs \ && rm -rf /usr/local/src/drush8/examples \ && rm -rf /usr/local/src/drush8/misc \ -&& rm -rf /usr/local/src/drush8/tests \ \ # drush9 && git clone https://github.com/drush-ops/drush.git /usr/local/src/drush9 \ @@ -182,7 +180,6 @@ RUN set -x \ && rm -rf /usr/local/src/drush9/docs \ && rm -rf /usr/local/src/drush9/examples \ && rm -rf /usr/local/src/drush9/misc \ -&& rm -rf /usr/local/src/drush9/tests \ \ # drupalconsole && curl https://drupalconsole.com/installer -L -o /usr/local/bin/drupal \ diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index df1a2e1e..8ec19af7 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -154,7 +154,6 @@ RUN set -x \ && rm -rf /usr/local/src/drush7/docs \ && rm -rf /usr/local/src/drush7/examples \ && rm -rf /usr/local/src/drush7/misc \ -&& rm -rf /usr/local/src/drush7/tests \ \ # drush8 && git clone https://github.com/drush-ops/drush.git /usr/local/src/drush8 \ @@ -168,7 +167,6 @@ RUN set -x \ && rm -rf /usr/local/src/drush8/docs \ && rm -rf /usr/local/src/drush8/examples \ && rm -rf /usr/local/src/drush8/misc \ -&& rm -rf /usr/local/src/drush8/tests \ \ # drush9 && git clone https://github.com/drush-ops/drush.git /usr/local/src/drush9 \ @@ -182,7 +180,6 @@ RUN set -x \ && rm -rf /usr/local/src/drush9/docs \ && rm -rf /usr/local/src/drush9/examples \ && rm -rf /usr/local/src/drush9/misc \ -&& rm -rf /usr/local/src/drush9/tests \ \ # drupalconsole && curl https://drupalconsole.com/installer -L -o /usr/local/bin/drupal \ diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index fbd7178a..485b1a40 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -154,7 +154,6 @@ RUN set -x \ && rm -rf /usr/local/src/drush7/docs \ && rm -rf /usr/local/src/drush7/examples \ && rm -rf /usr/local/src/drush7/misc \ -&& rm -rf /usr/local/src/drush7/tests \ \ # drush8 && git clone https://github.com/drush-ops/drush.git /usr/local/src/drush8 \ @@ -168,7 +167,6 @@ RUN set -x \ && rm -rf /usr/local/src/drush8/docs \ && rm -rf /usr/local/src/drush8/examples \ && rm -rf /usr/local/src/drush8/misc \ -&& rm -rf /usr/local/src/drush8/tests \ \ # drush9 && git clone https://github.com/drush-ops/drush.git /usr/local/src/drush9 \ @@ -182,7 +180,6 @@ RUN set -x \ && rm -rf /usr/local/src/drush9/docs \ && rm -rf /usr/local/src/drush9/examples \ && rm -rf /usr/local/src/drush9/misc \ -&& rm -rf /usr/local/src/drush9/tests \ \ # drupalconsole && curl https://drupalconsole.com/installer -L -o /usr/local/bin/drupal \ diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index c71812e2..f710d376 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -154,7 +154,6 @@ RUN set -x \ && rm -rf /usr/local/src/drush7/docs \ && rm -rf /usr/local/src/drush7/examples \ && rm -rf /usr/local/src/drush7/misc \ -&& rm -rf /usr/local/src/drush7/tests \ \ # drush8 && git clone https://github.com/drush-ops/drush.git /usr/local/src/drush8 \ @@ -168,7 +167,6 @@ RUN set -x \ && rm -rf /usr/local/src/drush8/docs \ && rm -rf /usr/local/src/drush8/examples \ && rm -rf /usr/local/src/drush8/misc \ -&& rm -rf /usr/local/src/drush8/tests \ \ # drush9 && git clone https://github.com/drush-ops/drush.git /usr/local/src/drush9 \ @@ -182,7 +180,6 @@ RUN set -x \ && rm -rf /usr/local/src/drush9/docs \ && rm -rf /usr/local/src/drush9/examples \ && rm -rf /usr/local/src/drush9/misc \ -&& rm -rf /usr/local/src/drush9/tests \ \ # drupalconsole && curl https://drupalconsole.com/installer -L -o /usr/local/bin/drupal \ diff --git a/build/ansible/DOCKERFILES/Dockerfile-work.j2 b/build/ansible/DOCKERFILES/Dockerfile-work.j2 index b6182ea4..5dfd3f73 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-work.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-work.j2 @@ -122,9 +122,7 @@ RUN set -x \ whois \ wkhtmltopdf \ xz-utils \ -{% if php_version != 5.2 %} yarn \ -{% endif %} zsh \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* diff --git a/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml index 37c71d64..f4155803 100644 --- a/build/ansible/group_vars/all.yml +++ b/build/ansible/group_vars/all.yml @@ -358,7 +358,6 @@ software_available: && rm -rf /usr/local/src/drush7/docs \ && rm -rf /usr/local/src/drush7/examples \ && rm -rf /usr/local/src/drush7/misc \ - && rm -rf /usr/local/src/drush7/tests \ drush8: disabled: [5.2, 5.3] check: drush8 --version | grep -E '8[.0-9]+\s*$' @@ -375,7 +374,6 @@ software_available: && rm -rf /usr/local/src/drush8/docs \ && rm -rf /usr/local/src/drush8/examples \ && rm -rf /usr/local/src/drush8/misc \ - && rm -rf /usr/local/src/drush8/tests \ drush9: disabled: [5.2, 5.3, 5.4, 5.5] check: drush9 --version | grep -E '9[.0-9]+\s*$' @@ -392,7 +390,6 @@ software_available: && rm -rf /usr/local/src/drush9/docs \ && rm -rf /usr/local/src/drush9/examples \ && rm -rf /usr/local/src/drush9/misc \ - && rm -rf /usr/local/src/drush9/tests \ codeception: disabled: [5.2] check: codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' From 6fb6a2f61cbdededad151e91289ff7eda0782516 Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 1 Nov 2018 11:17:42 +0100 Subject: [PATCH 3/6] Fix swoole for PHP 7.3 --- Dockerfiles/mods/Dockerfile-7.3 | 3 ++- build/ansible/group_vars/all.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfiles/mods/Dockerfile-7.3 b/Dockerfiles/mods/Dockerfile-7.3 index 9f12c555..ff47f31e 100644 --- a/Dockerfiles/mods/Dockerfile-7.3 +++ b/Dockerfiles/mods/Dockerfile-7.3 @@ -157,7 +157,8 @@ RUN set -x \ && git clone -v https://github.com/swoole/swoole-src /tmp/swoole \ && cd /tmp/swoole \ && git checkout master \ - && git submodule update --init --recursive \ + && git checkout $(git describe --abbrev=0 --tags) \ +&& git submodule update --init --recursive \ && cd thirdparty/hiredis \ && make -j$(getconf _NPROCESSORS_ONLN) \ && make install \ diff --git a/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml index f4155803..cbe6a3e3 100644 --- a/build/ansible/group_vars/all.yml +++ b/build/ansible/group_vars/all.yml @@ -1304,7 +1304,8 @@ extensions_available: git_url: https://github.com/swoole/swoole-src git_ref: master command: | - git submodule update --init --recursive \ + git checkout $(git describe --abbrev=0 --tags) \ + && git submodule update --init --recursive \ && cd thirdparty/hiredis \ && make -j$(getconf _NPROCESSORS_ONLN) \ && make install \ From 10e114fdd2a45c3d4f25d7e25bafbc2aeceeecaf Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 1 Nov 2018 12:48:46 +0100 Subject: [PATCH 4/6] Decrease image size of mods images --- Dockerfiles/mods/Dockerfile-5.2 | 4 +++- Dockerfiles/mods/Dockerfile-5.3 | 5 +++-- Dockerfiles/mods/Dockerfile-5.4 | 5 +++-- Dockerfiles/mods/Dockerfile-5.5 | 5 +++-- Dockerfiles/mods/Dockerfile-5.6 | 5 +++-- Dockerfiles/mods/Dockerfile-7.0 | 7 +++---- Dockerfiles/mods/Dockerfile-7.1 | 7 +++---- Dockerfiles/mods/Dockerfile-7.2 | 7 +++---- Dockerfiles/mods/Dockerfile-7.3 | 7 +++---- Dockerfiles/work/Dockerfile-5.2 | 6 +++--- Dockerfiles/work/Dockerfile-5.3 | 10 +++++----- Dockerfiles/work/Dockerfile-5.4 | 14 +++++++------- Dockerfiles/work/Dockerfile-5.5 | 14 +++++++------- Dockerfiles/work/Dockerfile-5.6 | 16 ++++++++-------- Dockerfiles/work/Dockerfile-7.0 | 16 ++++++++-------- Dockerfiles/work/Dockerfile-7.1 | 16 ++++++++-------- Dockerfiles/work/Dockerfile-7.2 | 16 ++++++++-------- Dockerfiles/work/Dockerfile-7.3 | 16 ++++++++-------- build/ansible/DOCKERFILES/Dockerfile-mods.j2 | 6 +++--- build/ansible/group_vars/all.yml | 16 ++++++++-------- 20 files changed, 100 insertions(+), 98 deletions(-) diff --git a/Dockerfiles/mods/Dockerfile-5.2 b/Dockerfiles/mods/Dockerfile-5.2 index 986a3549..3b553ca4 100644 --- a/Dockerfiles/mods/Dockerfile-5.2 +++ b/Dockerfiles/mods/Dockerfile-5.2 @@ -171,13 +171,15 @@ ln -s /usr/include/freetype2/freetype.h /usr/include/freetype2/freetype/freetype && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xsl \ && /usr/local/bin/docker-php-ext-configure zip --with-zlib-dir=/usr --with-pcre-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) zip \ + && rm -rf /tmp/* \ \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false ${BUILD_DEPS} \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests ${RUN_DEPS} \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ && update-ca-certificates \ - && sh -c "find /usr/local -type f -perm /u+x -exec strip --strip-all '{}' + || true" + && find /usr/local/{bin,lib,sbin} -type f -print0 | xargs -0r strip --strip-all -p 2>/dev/null || true \ + && find "$(php -r 'echo ini_get("extension_dir");')" -print0 | xargs -0r strip --strip-all -p 2>/dev/null || true ### diff --git a/Dockerfiles/mods/Dockerfile-5.3 b/Dockerfiles/mods/Dockerfile-5.3 index 62d9bf2f..12c03fa5 100644 --- a/Dockerfiles/mods/Dockerfile-5.3 +++ b/Dockerfiles/mods/Dockerfile-5.3 @@ -159,7 +159,6 @@ RUN set -x \ && git checkout phalcon-v2.0.9 \ && cd build && ./install \ && docker-php-ext-enable phalcon \ - && cd / && rm -rf /tmp/phalcon \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pspell \ && pecl install redis \ && docker-php-ext-enable redis \ @@ -188,13 +187,15 @@ RUN set -x \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xsl \ && /usr/local/bin/docker-php-ext-configure zip --with-zlib-dir=/usr --with-pcre-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) zip \ + && rm -rf /tmp/* \ \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false ${BUILD_DEPS} \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests ${RUN_DEPS} \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ && update-ca-certificates \ - && sh -c "find /usr/local -type f -perm /u+x -exec strip --strip-all '{}' + || true" + && find /usr/local/{bin,lib,sbin} -type f -print0 | xargs -0r strip --strip-all -p 2>/dev/null || true \ + && find "$(php -r 'echo ini_get("extension_dir");')" -print0 | xargs -0r strip --strip-all -p 2>/dev/null || true ### diff --git a/Dockerfiles/mods/Dockerfile-5.4 b/Dockerfiles/mods/Dockerfile-5.4 index 7caf12f6..40c7ec1f 100644 --- a/Dockerfiles/mods/Dockerfile-5.4 +++ b/Dockerfiles/mods/Dockerfile-5.4 @@ -160,7 +160,6 @@ RUN set -x \ && git checkout phalcon-v2.0.13 \ && cd build && ./install \ && docker-php-ext-enable phalcon \ - && cd / && rm -rf /tmp/phalcon \ && /usr/local/bin/docker-php-ext-install pspell \ && pecl install redis \ && docker-php-ext-enable redis \ @@ -189,13 +188,15 @@ RUN set -x \ && /usr/local/bin/docker-php-ext-install xsl \ && /usr/local/bin/docker-php-ext-configure zip --with-zlib-dir=/usr --with-pcre-dir=/usr \ && /usr/local/bin/docker-php-ext-install zip \ + && rm -rf /tmp/* \ \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false ${BUILD_DEPS} \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests ${RUN_DEPS} \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ && update-ca-certificates \ - && sh -c "find /usr/local -type f -perm /u+x -exec strip --strip-all '{}' + || true" + && find /usr/local/{bin,lib,sbin} -type f -print0 | xargs -0r strip --strip-all -p 2>/dev/null || true \ + && find "$(php -r 'echo ini_get("extension_dir");')" -print0 | xargs -0r strip --strip-all -p 2>/dev/null || true ### diff --git a/Dockerfiles/mods/Dockerfile-5.5 b/Dockerfiles/mods/Dockerfile-5.5 index 8b359354..d68196e3 100644 --- a/Dockerfiles/mods/Dockerfile-5.5 +++ b/Dockerfiles/mods/Dockerfile-5.5 @@ -157,7 +157,6 @@ RUN set -x \ && git checkout $(git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | tail -1 | sed 's/^.*tags\///g') \ && cd build && ./install \ && docker-php-ext-enable phalcon \ - && cd / && rm -rf /tmp/phalcon \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pspell \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \ && pecl install redis \ @@ -187,13 +186,15 @@ RUN set -x \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xsl \ && /usr/local/bin/docker-php-ext-configure zip --with-zlib-dir=/usr --with-pcre-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) zip \ + && rm -rf /tmp/* \ \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false ${BUILD_DEPS} \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests ${RUN_DEPS} \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ && update-ca-certificates \ - && sh -c "find /usr/local -type f -perm /u+x -exec strip --strip-all '{}' + || true" + && find /usr/local/{bin,lib,sbin} -type f -print0 | xargs -0r strip --strip-all -p 2>/dev/null || true \ + && find "$(php -r 'echo ini_get("extension_dir");')" -print0 | xargs -0r strip --strip-all -p 2>/dev/null || true ### diff --git a/Dockerfiles/mods/Dockerfile-5.6 b/Dockerfiles/mods/Dockerfile-5.6 index dedb5879..75fb6ee0 100644 --- a/Dockerfiles/mods/Dockerfile-5.6 +++ b/Dockerfiles/mods/Dockerfile-5.6 @@ -161,7 +161,6 @@ RUN set -x \ && git checkout $(git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | tail -1 | sed 's/^.*tags\///g') \ && cd build && ./install \ && docker-php-ext-enable phalcon \ - && cd / && rm -rf /tmp/phalcon \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pspell \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \ && pecl install redis \ @@ -191,13 +190,15 @@ RUN set -x \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xsl \ && /usr/local/bin/docker-php-ext-configure zip --with-zlib-dir=/usr --with-pcre-dir=/usr --with-libzip \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) zip \ + && rm -rf /tmp/* \ \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false ${BUILD_DEPS} \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests ${RUN_DEPS} \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ && update-ca-certificates \ - && sh -c "find /usr/local -type f -perm /u+x -exec strip --strip-all '{}' + || true" + && find /usr/local/{bin,lib,sbin} -type f -print0 | xargs -0r strip --strip-all -p 2>/dev/null || true \ + && find "$(php -r 'echo ini_get("extension_dir");')" -print0 | xargs -0r strip --strip-all -p 2>/dev/null || true ### diff --git a/Dockerfiles/mods/Dockerfile-7.0 b/Dockerfiles/mods/Dockerfile-7.0 index 4f4c6d6b..6908daa7 100644 --- a/Dockerfiles/mods/Dockerfile-7.0 +++ b/Dockerfiles/mods/Dockerfile-7.0 @@ -141,7 +141,6 @@ RUN set -x \ && make -j$(getconf _NPROCESSORS_ONLN) \ && make install \ && docker-php-ext-enable memcache \ - && cd / && rm -rf /tmp/memcache \ && pecl install memcached \ && docker-php-ext-enable memcached \ && pecl install mongodb \ @@ -164,7 +163,6 @@ RUN set -x \ && git checkout $(git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | tail -1 | sed 's/^.*tags\///g') \ && cd build && ./install \ && docker-php-ext-enable phalcon \ - && cd / && rm -rf /tmp/phalcon \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pspell \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \ && pecl install redis \ @@ -190,7 +188,6 @@ RUN set -x \ && make -j$(getconf _NPROCESSORS_ONLN) \ && make install \ && docker-php-ext-enable uploadprogress \ - && cd / && rm -rf /tmp/uploadprogress \ && /usr/local/bin/docker-php-ext-configure wddx --with-libxml-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) wddx \ && pecl install xdebug \ @@ -200,13 +197,15 @@ RUN set -x \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xsl \ && /usr/local/bin/docker-php-ext-configure zip --with-zlib-dir=/usr --with-pcre-dir=/usr --with-libzip \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) zip \ + && rm -rf /tmp/* \ \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false ${BUILD_DEPS} \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests ${RUN_DEPS} \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ && update-ca-certificates \ - && sh -c "find /usr/local -type f -perm /u+x -exec strip --strip-all '{}' + || true" + && find /usr/local/{bin,lib,sbin} -type f -print0 | xargs -0r strip --strip-all -p 2>/dev/null || true \ + && find "$(php -r 'echo ini_get("extension_dir");')" -print0 | xargs -0r strip --strip-all -p 2>/dev/null || true ### diff --git a/Dockerfiles/mods/Dockerfile-7.1 b/Dockerfiles/mods/Dockerfile-7.1 index 39f26686..d0a59723 100644 --- a/Dockerfiles/mods/Dockerfile-7.1 +++ b/Dockerfiles/mods/Dockerfile-7.1 @@ -141,7 +141,6 @@ RUN set -x \ && make -j$(getconf _NPROCESSORS_ONLN) \ && make install \ && docker-php-ext-enable memcache \ - && cd / && rm -rf /tmp/memcache \ && pecl install memcached \ && docker-php-ext-enable memcached \ && pecl install mongodb \ @@ -163,7 +162,6 @@ RUN set -x \ && git checkout $(git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | tail -1 | sed 's/^.*tags\///g') \ && cd build && ./install \ && docker-php-ext-enable phalcon \ - && cd / && rm -rf /tmp/phalcon \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pspell \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \ && pecl install redis \ @@ -189,7 +187,6 @@ RUN set -x \ && make -j$(getconf _NPROCESSORS_ONLN) \ && make install \ && docker-php-ext-enable uploadprogress \ - && cd / && rm -rf /tmp/uploadprogress \ && /usr/local/bin/docker-php-ext-configure wddx --with-libxml-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) wddx \ && pecl install xdebug \ @@ -199,13 +196,15 @@ RUN set -x \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xsl \ && /usr/local/bin/docker-php-ext-configure zip --with-zlib-dir=/usr --with-pcre-dir=/usr --with-libzip \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) zip \ + && rm -rf /tmp/* \ \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false ${BUILD_DEPS} \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests ${RUN_DEPS} \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ && update-ca-certificates \ - && sh -c "find /usr/local -type f -perm /u+x -exec strip --strip-all '{}' + || true" + && find /usr/local/{bin,lib,sbin} -type f -print0 | xargs -0r strip --strip-all -p 2>/dev/null || true \ + && find "$(php -r 'echo ini_get("extension_dir");')" -print0 | xargs -0r strip --strip-all -p 2>/dev/null || true ### diff --git a/Dockerfiles/mods/Dockerfile-7.2 b/Dockerfiles/mods/Dockerfile-7.2 index 275c869d..5d69e49d 100644 --- a/Dockerfiles/mods/Dockerfile-7.2 +++ b/Dockerfiles/mods/Dockerfile-7.2 @@ -142,7 +142,6 @@ RUN set -x \ && make -j$(getconf _NPROCESSORS_ONLN) \ && make install \ && docker-php-ext-enable memcache \ - && cd / && rm -rf /tmp/memcache \ && pecl install memcached \ && docker-php-ext-enable memcached \ && pecl install mongodb \ @@ -164,7 +163,6 @@ RUN set -x \ && git checkout $(git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | tail -1 | sed 's/^.*tags\///g') \ && cd build && ./install \ && docker-php-ext-enable phalcon \ - && cd / && rm -rf /tmp/phalcon \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pspell \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \ && pecl install redis \ @@ -190,7 +188,6 @@ RUN set -x \ && make -j$(getconf _NPROCESSORS_ONLN) \ && make install \ && docker-php-ext-enable uploadprogress \ - && cd / && rm -rf /tmp/uploadprogress \ && /usr/local/bin/docker-php-ext-configure wddx --with-libxml-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) wddx \ && pecl install xdebug \ @@ -200,13 +197,15 @@ RUN set -x \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xsl \ && /usr/local/bin/docker-php-ext-configure zip --with-zlib-dir=/usr --with-pcre-dir=/usr --with-libzip \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) zip \ + && rm -rf /tmp/* \ \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false ${BUILD_DEPS} \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests ${RUN_DEPS} \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ && update-ca-certificates \ - && sh -c "find /usr/local -type f -perm /u+x -exec strip --strip-all '{}' + || true" + && find /usr/local/{bin,lib,sbin} -type f -print0 | xargs -0r strip --strip-all -p 2>/dev/null || true \ + && find "$(php -r 'echo ini_get("extension_dir");')" -print0 | xargs -0r strip --strip-all -p 2>/dev/null || true ### diff --git a/Dockerfiles/mods/Dockerfile-7.3 b/Dockerfiles/mods/Dockerfile-7.3 index ff47f31e..ad82cd87 100644 --- a/Dockerfiles/mods/Dockerfile-7.3 +++ b/Dockerfiles/mods/Dockerfile-7.3 @@ -129,7 +129,6 @@ RUN set -x \ && git checkout master \ && phpize && ./configure --enable-memcached && make -j$(getconf _NPROCESSORS_ONLN) && make install \ && docker-php-ext-enable memcached \ - && cd / && rm -rf /tmp/memcached \ && pecl install mongodb \ && docker-php-ext-enable mongodb \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysqli \ @@ -192,7 +191,6 @@ RUN set -x \ && make install \ \ && docker-php-ext-enable swoole \ - && cd / && rm -rf /tmp/swoole \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvmsg \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvsem \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvshm \ @@ -204,7 +202,6 @@ RUN set -x \ && make -j$(getconf _NPROCESSORS_ONLN) \ && make install \ && docker-php-ext-enable uploadprogress \ - && cd / && rm -rf /tmp/uploadprogress \ && /usr/local/bin/docker-php-ext-configure wddx --with-libxml-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) wddx \ && /usr/local/bin/docker-php-ext-configure xmlrpc --with-libxml-dir=/usr --with-iconv-dir=/usr \ @@ -212,13 +209,15 @@ RUN set -x \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xsl \ && /usr/local/bin/docker-php-ext-configure zip --with-zlib-dir=/usr --with-pcre-dir=/usr --with-libzip \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) zip \ + && rm -rf /tmp/* \ \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false ${BUILD_DEPS} \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests ${RUN_DEPS} \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ && update-ca-certificates \ - && sh -c "find /usr/local -type f -perm /u+x -exec strip --strip-all '{}' + || true" + && find /usr/local/{bin,lib,sbin} -type f -print0 | xargs -0r strip --strip-all -p 2>/dev/null || true \ + && find "$(php -r 'echo ini_get("extension_dir");')" -print0 | xargs -0r strip --strip-all -p 2>/dev/null || true ### diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2 index b357b14b..2509199e 100644 --- a/Dockerfiles/work/Dockerfile-5.2 +++ b/Dockerfiles/work/Dockerfile-5.2 @@ -109,8 +109,8 @@ RUN set -x \ RUN set -x \ # ansible - && pip install --upgrade setuptools \ -&& pip install ansible \ + && pip install --no-cache-dir --upgrade setuptools \ +&& pip install --no-cache-dir ansible \ \ # awesomeci && git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \ @@ -194,7 +194,7 @@ RUN set -x \ && npm install -g webpack webpack-cli \ # yamllint && apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev python-setuptools libyaml-dev \ - && pip install yamllint \ + && pip install --no-cache-dir yamllint \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev python-setuptools libyaml-dev && rm -rf /var/lib/apt/lists/* \ # cleanup && rm -rf /home/${MY_USER}/.*json \ diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3 index b3c336cf..760716fb 100644 --- a/Dockerfiles/work/Dockerfile-5.3 +++ b/Dockerfiles/work/Dockerfile-5.3 @@ -111,8 +111,8 @@ RUN set -x \ # composer && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ # ansible - && pip install --upgrade setuptools \ -&& pip install ansible \ + && pip install --no-cache-dir --upgrade setuptools \ +&& pip install --no-cache-dir ansible \ \ # awesomeci && git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \ @@ -132,7 +132,7 @@ RUN set -x \ && npm install -g gulp \ \ # codeception - && COMPOSER_HOME="/usr/local/src/composer" composer global require codeception/codeception --dev \ + && COMPOSER_HOME="/usr/local/src/composer" composer global require codeception/codeception \ && ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/codecept \ \ # drush7 @@ -141,7 +141,7 @@ RUN set -x \ && git checkout 7.4.0 \ \ && chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/drush7 \ -&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush7 && composer install --no-interaction --no-progress' \ +&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush7 && composer install --no-interaction --no-progress --no-dev' \ && ln -s /usr/local/src/drush7/drush /usr/local/bin/drush7 \ && rm -rf /usr/local/src/drush7/.git \ && rm -rf /usr/local/src/drush7/docs \ @@ -231,7 +231,7 @@ RUN set -x \ && chmod +x /usr/local/bin/wp \ # yamllint && apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev python-setuptools libyaml-dev \ - && pip install yamllint \ + && pip install --no-cache-dir yamllint \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev python-setuptools libyaml-dev && rm -rf /var/lib/apt/lists/* \ # cleanup && rm -rf /home/${MY_USER}/.*json \ diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index 2a5dce26..2c45fb3a 100644 --- a/Dockerfiles/work/Dockerfile-5.4 +++ b/Dockerfiles/work/Dockerfile-5.4 @@ -111,8 +111,8 @@ RUN set -x \ # composer && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ # ansible - && pip install --upgrade setuptools \ -&& pip install ansible \ + && pip install --no-cache-dir --upgrade setuptools \ +&& pip install --no-cache-dir ansible \ \ # awesomeci && git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \ @@ -132,7 +132,7 @@ RUN set -x \ && npm install -g gulp \ \ # codeception - && COMPOSER_HOME="/usr/local/src/composer" composer global require codeception/codeception --dev \ + && COMPOSER_HOME="/usr/local/src/composer" composer global require codeception/codeception \ && ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/codecept \ \ # deployer @@ -144,7 +144,7 @@ RUN set -x \ && git checkout 7.4.0 \ \ && chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/drush7 \ -&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush7 && composer install --no-interaction --no-progress' \ +&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush7 && composer install --no-interaction --no-progress --no-dev' \ && ln -s /usr/local/src/drush7/drush /usr/local/bin/drush7 \ && rm -rf /usr/local/src/drush7/.git \ && rm -rf /usr/local/src/drush7/docs \ @@ -157,7 +157,7 @@ RUN set -x \ && git checkout $( git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | grep -E 'tags/8[.0-9]+$' | tail -1 | sed 's|.*/||g' ) \ \ && chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/drush8 \ -&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush8 && composer install --no-interaction --no-progress' \ +&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush8 && composer install --no-interaction --no-progress --no-dev' \ && ln -s /usr/local/src/drush8/drush /usr/local/bin/drush8 \ && rm -rf /usr/local/src/drush8/.git \ && rm -rf /usr/local/src/drush8/docs \ @@ -178,7 +178,7 @@ RUN set -x \ && git checkout v1.3.7 \ \ && chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/laravel-installer \ -&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/laravel-installer && composer install' \ +&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/laravel-installer && composer install --no-interaction --no-progress --no-dev' \ && ln -s /usr/local/src/laravel-installer/laravel /usr/local/bin/laravel \ && rm -rf /usr/local/src/laravel-installer/laravel/.git \ \ @@ -260,7 +260,7 @@ RUN set -x \ && chmod +x /usr/local/bin/wp \ # yamllint && apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev python-setuptools libyaml-dev \ - && pip install yamllint \ + && pip install --no-cache-dir yamllint \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev python-setuptools libyaml-dev && rm -rf /var/lib/apt/lists/* \ # cleanup && rm -rf /home/${MY_USER}/.*json \ diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index 21af6b1d..fc2cdd48 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -111,8 +111,8 @@ RUN set -x \ # composer && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ # ansible - && pip install --upgrade setuptools \ -&& pip install ansible \ + && pip install --no-cache-dir --upgrade setuptools \ +&& pip install --no-cache-dir ansible \ \ # asgardcms && COMPOSER_HOME="/usr/local/src/composer" composer global require asgardcms/asgardcms-installer \ @@ -136,7 +136,7 @@ RUN set -x \ && npm install -g gulp \ \ # codeception - && COMPOSER_HOME="/usr/local/src/composer" composer global require codeception/codeception --dev \ + && COMPOSER_HOME="/usr/local/src/composer" composer global require codeception/codeception \ && ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/codecept \ \ # deployer @@ -148,7 +148,7 @@ RUN set -x \ && git checkout 7.4.0 \ \ && chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/drush7 \ -&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush7 && composer install --no-interaction --no-progress' \ +&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush7 && composer install --no-interaction --no-progress --no-dev' \ && ln -s /usr/local/src/drush7/drush /usr/local/bin/drush7 \ && rm -rf /usr/local/src/drush7/.git \ && rm -rf /usr/local/src/drush7/docs \ @@ -161,7 +161,7 @@ RUN set -x \ && git checkout $( git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | grep -E 'tags/8[.0-9]+$' | tail -1 | sed 's|.*/||g' ) \ \ && chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/drush8 \ -&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush8 && composer install --no-interaction --no-progress' \ +&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush8 && composer install --no-interaction --no-progress --no-dev' \ && ln -s /usr/local/src/drush8/drush /usr/local/bin/drush8 \ && rm -rf /usr/local/src/drush8/.git \ && rm -rf /usr/local/src/drush8/docs \ @@ -185,7 +185,7 @@ RUN set -x \ && git checkout v2.0.0 \ \ && chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/laravel-installer \ -&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/laravel-installer && composer install' \ +&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/laravel-installer && composer install --no-interaction --no-progress --no-dev' \ && ln -s /usr/local/src/laravel-installer/laravel /usr/local/bin/laravel \ && rm -rf /usr/local/src/laravel-installer/laravel/.git \ \ @@ -271,7 +271,7 @@ RUN set -x \ && chmod +x /usr/local/bin/wp \ # yamllint && apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev python-setuptools libyaml-dev \ - && pip install yamllint \ + && pip install --no-cache-dir yamllint \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev python-setuptools libyaml-dev && rm -rf /var/lib/apt/lists/* \ # cleanup && rm -rf /home/${MY_USER}/.*json \ diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index b89c2dc3..e8951722 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -111,8 +111,8 @@ RUN set -x \ # composer && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ # ansible - && pip install --upgrade setuptools \ -&& pip install ansible \ + && pip install --no-cache-dir --upgrade setuptools \ +&& pip install --no-cache-dir ansible \ \ # asgardcms && COMPOSER_HOME="/usr/local/src/composer" composer global require asgardcms/asgardcms-installer \ @@ -136,7 +136,7 @@ RUN set -x \ && npm install -g gulp \ \ # codeception - && COMPOSER_HOME="/usr/local/src/composer" composer global require codeception/codeception --dev \ + && COMPOSER_HOME="/usr/local/src/composer" composer global require codeception/codeception \ && ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/codecept \ \ # deployer @@ -148,7 +148,7 @@ RUN set -x \ && git checkout 7.4.0 \ \ && chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/drush7 \ -&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush7 && composer install --no-interaction --no-progress' \ +&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush7 && composer install --no-interaction --no-progress --no-dev' \ && ln -s /usr/local/src/drush7/drush /usr/local/bin/drush7 \ && rm -rf /usr/local/src/drush7/.git \ && rm -rf /usr/local/src/drush7/docs \ @@ -161,7 +161,7 @@ RUN set -x \ && git checkout $( git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | grep -E 'tags/8[.0-9]+$' | tail -1 | sed 's|.*/||g' ) \ \ && chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/drush8 \ -&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush8 && composer install --no-interaction --no-progress' \ +&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush8 && composer install --no-interaction --no-progress --no-dev' \ && ln -s /usr/local/src/drush8/drush /usr/local/bin/drush8 \ && rm -rf /usr/local/src/drush8/.git \ && rm -rf /usr/local/src/drush8/docs \ @@ -174,7 +174,7 @@ RUN set -x \ && git checkout $( git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | grep -E 'tags/9[.0-9]+$' | tail -1 | sed 's|.*/||g' ) \ \ && chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/drush9 \ -&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush9 && composer install --no-interaction --no-progress' \ +&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush9 && composer install --no-interaction --no-progress --no-dev' \ && ln -s /usr/local/src/drush9/drush /usr/local/bin/drush9 \ && rm -rf /usr/local/src/drush9/.git \ && rm -rf /usr/local/src/drush9/docs \ @@ -198,7 +198,7 @@ RUN set -x \ && git checkout v2.0.0 \ \ && chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/laravel-installer \ -&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/laravel-installer && composer install' \ +&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/laravel-installer && composer install --no-interaction --no-progress --no-dev' \ && ln -s /usr/local/src/laravel-installer/laravel /usr/local/bin/laravel \ && rm -rf /usr/local/src/laravel-installer/laravel/.git \ \ @@ -284,7 +284,7 @@ RUN set -x \ && chmod +x /usr/local/bin/wp \ # yamllint && apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev python-setuptools libyaml-dev \ - && pip install yamllint \ + && pip install --no-cache-dir yamllint \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev python-setuptools libyaml-dev && rm -rf /var/lib/apt/lists/* \ # cleanup && rm -rf /home/${MY_USER}/.*json \ diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index 671f6d54..87ad4381 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -111,8 +111,8 @@ RUN set -x \ # composer && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ # ansible - && pip install --upgrade setuptools \ -&& pip install ansible \ + && pip install --no-cache-dir --upgrade setuptools \ +&& pip install --no-cache-dir ansible \ \ # asgardcms && COMPOSER_HOME="/usr/local/src/composer" composer global require asgardcms/asgardcms-installer \ @@ -136,7 +136,7 @@ RUN set -x \ && npm install -g gulp \ \ # codeception - && COMPOSER_HOME="/usr/local/src/composer" composer global require codeception/codeception --dev \ + && COMPOSER_HOME="/usr/local/src/composer" composer global require codeception/codeception \ && ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/codecept \ \ # deployer @@ -148,7 +148,7 @@ RUN set -x \ && git checkout 7.4.0 \ \ && chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/drush7 \ -&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush7 && composer install --no-interaction --no-progress' \ +&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush7 && composer install --no-interaction --no-progress --no-dev' \ && ln -s /usr/local/src/drush7/drush /usr/local/bin/drush7 \ && rm -rf /usr/local/src/drush7/.git \ && rm -rf /usr/local/src/drush7/docs \ @@ -161,7 +161,7 @@ RUN set -x \ && git checkout $( git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | grep -E 'tags/8[.0-9]+$' | tail -1 | sed 's|.*/||g' ) \ \ && chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/drush8 \ -&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush8 && composer install --no-interaction --no-progress' \ +&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush8 && composer install --no-interaction --no-progress --no-dev' \ && ln -s /usr/local/src/drush8/drush /usr/local/bin/drush8 \ && rm -rf /usr/local/src/drush8/.git \ && rm -rf /usr/local/src/drush8/docs \ @@ -174,7 +174,7 @@ RUN set -x \ && git checkout $( git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | grep -E 'tags/9[.0-9]+$' | tail -1 | sed 's|.*/||g' ) \ \ && chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/drush9 \ -&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush9 && composer install --no-interaction --no-progress' \ +&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush9 && composer install --no-interaction --no-progress --no-dev' \ && ln -s /usr/local/src/drush9/drush /usr/local/bin/drush9 \ && rm -rf /usr/local/src/drush9/.git \ && rm -rf /usr/local/src/drush9/docs \ @@ -198,7 +198,7 @@ RUN set -x \ && git checkout v2.0.0 \ \ && chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/laravel-installer \ -&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/laravel-installer && composer install' \ +&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/laravel-installer && composer install --no-interaction --no-progress --no-dev' \ && ln -s /usr/local/src/laravel-installer/laravel /usr/local/bin/laravel \ && rm -rf /usr/local/src/laravel-installer/laravel/.git \ \ @@ -284,7 +284,7 @@ RUN set -x \ && chmod +x /usr/local/bin/wp \ # yamllint && apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev python-setuptools libyaml-dev \ - && pip install yamllint \ + && pip install --no-cache-dir yamllint \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev python-setuptools libyaml-dev && rm -rf /var/lib/apt/lists/* \ # cleanup && rm -rf /home/${MY_USER}/.*json \ diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index 8ec19af7..98cf32e4 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -111,8 +111,8 @@ RUN set -x \ # composer && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ # ansible - && pip install --upgrade setuptools \ -&& pip install ansible \ + && pip install --no-cache-dir --upgrade setuptools \ +&& pip install --no-cache-dir ansible \ \ # asgardcms && COMPOSER_HOME="/usr/local/src/composer" composer global require asgardcms/asgardcms-installer \ @@ -136,7 +136,7 @@ RUN set -x \ && npm install -g gulp \ \ # codeception - && COMPOSER_HOME="/usr/local/src/composer" composer global require codeception/codeception --dev \ + && COMPOSER_HOME="/usr/local/src/composer" composer global require codeception/codeception \ && ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/codecept \ \ # deployer @@ -148,7 +148,7 @@ RUN set -x \ && git checkout 7.4.0 \ \ && chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/drush7 \ -&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush7 && composer install --no-interaction --no-progress' \ +&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush7 && composer install --no-interaction --no-progress --no-dev' \ && ln -s /usr/local/src/drush7/drush /usr/local/bin/drush7 \ && rm -rf /usr/local/src/drush7/.git \ && rm -rf /usr/local/src/drush7/docs \ @@ -161,7 +161,7 @@ RUN set -x \ && git checkout $( git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | grep -E 'tags/8[.0-9]+$' | tail -1 | sed 's|.*/||g' ) \ \ && chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/drush8 \ -&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush8 && composer install --no-interaction --no-progress' \ +&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush8 && composer install --no-interaction --no-progress --no-dev' \ && ln -s /usr/local/src/drush8/drush /usr/local/bin/drush8 \ && rm -rf /usr/local/src/drush8/.git \ && rm -rf /usr/local/src/drush8/docs \ @@ -174,7 +174,7 @@ RUN set -x \ && git checkout $( git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | grep -E 'tags/9[.0-9]+$' | tail -1 | sed 's|.*/||g' ) \ \ && chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/drush9 \ -&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush9 && composer install --no-interaction --no-progress' \ +&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush9 && composer install --no-interaction --no-progress --no-dev' \ && ln -s /usr/local/src/drush9/drush /usr/local/bin/drush9 \ && rm -rf /usr/local/src/drush9/.git \ && rm -rf /usr/local/src/drush9/docs \ @@ -198,7 +198,7 @@ RUN set -x \ && git checkout $(git describe --abbrev=0 --tags) \ \ && chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/laravel-installer \ -&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/laravel-installer && composer install' \ +&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/laravel-installer && composer install --no-interaction --no-progress --no-dev' \ && ln -s /usr/local/src/laravel-installer/laravel /usr/local/bin/laravel \ && rm -rf /usr/local/src/laravel-installer/laravel/.git \ \ @@ -284,7 +284,7 @@ RUN set -x \ && chmod +x /usr/local/bin/wp \ # yamllint && apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev python-setuptools libyaml-dev \ - && pip install yamllint \ + && pip install --no-cache-dir yamllint \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev python-setuptools libyaml-dev && rm -rf /var/lib/apt/lists/* \ # cleanup && rm -rf /home/${MY_USER}/.*json \ diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index 485b1a40..9d30f7a8 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -111,8 +111,8 @@ RUN set -x \ # composer && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ # ansible - && pip install --upgrade setuptools \ -&& pip install ansible \ + && pip install --no-cache-dir --upgrade setuptools \ +&& pip install --no-cache-dir ansible \ \ # asgardcms && COMPOSER_HOME="/usr/local/src/composer" composer global require asgardcms/asgardcms-installer \ @@ -136,7 +136,7 @@ RUN set -x \ && npm install -g gulp \ \ # codeception - && COMPOSER_HOME="/usr/local/src/composer" composer global require codeception/codeception --dev \ + && COMPOSER_HOME="/usr/local/src/composer" composer global require codeception/codeception \ && ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/codecept \ \ # deployer @@ -148,7 +148,7 @@ RUN set -x \ && git checkout 7.4.0 \ \ && chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/drush7 \ -&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush7 && composer install --no-interaction --no-progress' \ +&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush7 && composer install --no-interaction --no-progress --no-dev' \ && ln -s /usr/local/src/drush7/drush /usr/local/bin/drush7 \ && rm -rf /usr/local/src/drush7/.git \ && rm -rf /usr/local/src/drush7/docs \ @@ -161,7 +161,7 @@ RUN set -x \ && git checkout $( git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | grep -E 'tags/8[.0-9]+$' | tail -1 | sed 's|.*/||g' ) \ \ && chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/drush8 \ -&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush8 && composer install --no-interaction --no-progress' \ +&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush8 && composer install --no-interaction --no-progress --no-dev' \ && ln -s /usr/local/src/drush8/drush /usr/local/bin/drush8 \ && rm -rf /usr/local/src/drush8/.git \ && rm -rf /usr/local/src/drush8/docs \ @@ -174,7 +174,7 @@ RUN set -x \ && git checkout $( git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | grep -E 'tags/9[.0-9]+$' | tail -1 | sed 's|.*/||g' ) \ \ && chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/drush9 \ -&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush9 && composer install --no-interaction --no-progress' \ +&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush9 && composer install --no-interaction --no-progress --no-dev' \ && ln -s /usr/local/src/drush9/drush /usr/local/bin/drush9 \ && rm -rf /usr/local/src/drush9/.git \ && rm -rf /usr/local/src/drush9/docs \ @@ -198,7 +198,7 @@ RUN set -x \ && git checkout $(git describe --abbrev=0 --tags) \ \ && chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/laravel-installer \ -&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/laravel-installer && composer install' \ +&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/laravel-installer && composer install --no-interaction --no-progress --no-dev' \ && ln -s /usr/local/src/laravel-installer/laravel /usr/local/bin/laravel \ && rm -rf /usr/local/src/laravel-installer/laravel/.git \ \ @@ -284,7 +284,7 @@ RUN set -x \ && chmod +x /usr/local/bin/wp \ # yamllint && apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev python-setuptools libyaml-dev \ - && pip install yamllint \ + && pip install --no-cache-dir yamllint \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev python-setuptools libyaml-dev && rm -rf /var/lib/apt/lists/* \ # cleanup && rm -rf /home/${MY_USER}/.*json \ diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index f710d376..0cf693ce 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -111,8 +111,8 @@ RUN set -x \ # composer && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ # ansible - && pip install --upgrade setuptools \ -&& pip install ansible \ + && pip install --no-cache-dir --upgrade setuptools \ +&& pip install --no-cache-dir ansible \ \ # asgardcms && COMPOSER_HOME="/usr/local/src/composer" composer global require asgardcms/asgardcms-installer \ @@ -136,7 +136,7 @@ RUN set -x \ && npm install -g gulp \ \ # codeception - && COMPOSER_HOME="/usr/local/src/composer" composer global require codeception/codeception --dev \ + && COMPOSER_HOME="/usr/local/src/composer" composer global require codeception/codeception \ && ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/codecept \ \ # deployer @@ -148,7 +148,7 @@ RUN set -x \ && git checkout 7.4.0 \ \ && chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/drush7 \ -&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush7 && composer install --no-interaction --no-progress' \ +&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush7 && composer install --no-interaction --no-progress --no-dev' \ && ln -s /usr/local/src/drush7/drush /usr/local/bin/drush7 \ && rm -rf /usr/local/src/drush7/.git \ && rm -rf /usr/local/src/drush7/docs \ @@ -161,7 +161,7 @@ RUN set -x \ && git checkout $( git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | grep -E 'tags/8[.0-9]+$' | tail -1 | sed 's|.*/||g' ) \ \ && chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/drush8 \ -&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush8 && composer install --no-interaction --no-progress' \ +&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush8 && composer install --no-interaction --no-progress --no-dev' \ && ln -s /usr/local/src/drush8/drush /usr/local/bin/drush8 \ && rm -rf /usr/local/src/drush8/.git \ && rm -rf /usr/local/src/drush8/docs \ @@ -174,7 +174,7 @@ RUN set -x \ && git checkout $( git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | grep -E 'tags/9[.0-9]+$' | tail -1 | sed 's|.*/||g' ) \ \ && chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/drush9 \ -&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush9 && composer install --no-interaction --no-progress' \ +&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush9 && composer install --no-interaction --no-progress --no-dev' \ && ln -s /usr/local/src/drush9/drush /usr/local/bin/drush9 \ && rm -rf /usr/local/src/drush9/.git \ && rm -rf /usr/local/src/drush9/docs \ @@ -198,7 +198,7 @@ RUN set -x \ && git checkout $(git describe --abbrev=0 --tags) \ \ && chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/laravel-installer \ -&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/laravel-installer && composer install' \ +&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/laravel-installer && composer install --no-interaction --no-progress --no-dev' \ && ln -s /usr/local/src/laravel-installer/laravel /usr/local/bin/laravel \ && rm -rf /usr/local/src/laravel-installer/laravel/.git \ \ @@ -273,7 +273,7 @@ RUN set -x \ && chmod +x /usr/local/bin/wp \ # yamllint && apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev python-setuptools libyaml-dev \ - && pip install yamllint \ + && pip install --no-cache-dir yamllint \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev python-setuptools libyaml-dev && rm -rf /var/lib/apt/lists/* \ # cleanup && rm -rf /home/${MY_USER}/.*json \ diff --git a/build/ansible/DOCKERFILES/Dockerfile-mods.j2 b/build/ansible/DOCKERFILES/Dockerfile-mods.j2 index 53fce99a..52971353 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-mods.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-mods.j2 @@ -126,7 +126,6 @@ RUN set -x \ && make install \ {% endif %} && docker-php-ext-enable {{ ext }} \ - && cd / && rm -rf /tmp/{{ ext }} \ {# ---- 4.) CUSTOM ---- #} {% elif extensions_available[ext][php_version]['type'] == 'custom' %} && {{ extensions_available[ext][php_version]['command'] }} \ @@ -163,7 +162,6 @@ RUN set -x \ && make install \ {% endif %} && docker-php-ext-enable {{ ext }} \ - && cd / && rm -rf /tmp/{{ ext }} \ {# ---- 4.) CUSTOM ---- #} {% elif extensions_available[ext]['all']['type'] == 'custom' %} && {{ extensions_available[ext]['all']['command'] }} \ @@ -179,13 +177,15 @@ RUN set -x \ {% endif %} {% endif %} {% endfor %} + && rm -rf /tmp/* \ \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false ${BUILD_DEPS} \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests ${RUN_DEPS} \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ && update-ca-certificates \ - && sh -c "find /usr/local -type f -perm /u+x -exec strip --strip-all '{}' + || true" + && find /usr/local/{bin,lib,sbin} -type f -print0 | xargs -0r strip --strip-all -p 2>/dev/null || true \ + && find "$(php -r 'echo ini_get("extension_dir");')" -print0 | xargs -0r strip --strip-all -p 2>/dev/null || true {% if debug %} diff --git a/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml index cbe6a3e3..1a62ddfe 100644 --- a/build/ansible/group_vars/all.yml +++ b/build/ansible/group_vars/all.yml @@ -303,8 +303,8 @@ software_available: check: ansible --version | grep -E '^ansible [.0-9]+$' all: command: | - pip install --upgrade setuptools \ - && pip install ansible \ + pip install --no-cache-dir --upgrade setuptools \ + && pip install --no-cache-dir ansible \ awesomeci: check: | mdl --version | grep -E '[.0-9]+' \ @@ -352,7 +352,7 @@ software_available: && git checkout 7.4.0 \ command: | chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/drush7 \ - && su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush7 && composer install --no-interaction --no-progress' \ + && su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush7 && composer install --no-interaction --no-progress --no-dev' \ && ln -s /usr/local/src/drush7/drush /usr/local/bin/drush7 \ && rm -rf /usr/local/src/drush7/.git \ && rm -rf /usr/local/src/drush7/docs \ @@ -368,7 +368,7 @@ software_available: && git checkout $( git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | grep -E 'tags/8[.0-9]+$' | tail -1 | sed 's|.*/||g' ) \ command: | chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/drush8 \ - && su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush8 && composer install --no-interaction --no-progress' \ + && su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush8 && composer install --no-interaction --no-progress --no-dev' \ && ln -s /usr/local/src/drush8/drush /usr/local/bin/drush8 \ && rm -rf /usr/local/src/drush8/.git \ && rm -rf /usr/local/src/drush8/docs \ @@ -384,7 +384,7 @@ software_available: && git checkout $( git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | grep -E 'tags/9[.0-9]+$' | tail -1 | sed 's|.*/||g' ) \ command: | chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/drush9 \ - && su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush9 && composer install --no-interaction --no-progress' \ + && su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush9 && composer install --no-interaction --no-progress --no-dev' \ && ln -s /usr/local/src/drush9/drush /usr/local/bin/drush9 \ && rm -rf /usr/local/src/drush9/.git \ && rm -rf /usr/local/src/drush9/docs \ @@ -395,7 +395,7 @@ software_available: check: codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' all: command: | - COMPOSER_HOME="{{ compose_home }}" composer global require codeception/codeception --dev \ + COMPOSER_HOME="{{ compose_home }}" composer global require codeception/codeception \ && ln -s {{ compose_home }}/vendor/codeception/codeception/codecept /usr/local/bin/codecept \ drupalconsole: disabled: [5.2, 5.3, 5.4] @@ -445,7 +445,7 @@ software_available: && git checkout $(git describe --abbrev=0 --tags) \ command: | chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/laravel-installer \ - && su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/laravel-installer && composer install' \ + && su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/laravel-installer && composer install --no-interaction --no-progress --no-dev' \ && ln -s /usr/local/src/laravel-installer/laravel /usr/local/bin/laravel \ && rm -rf /usr/local/src/laravel-installer/laravel/.git \ linkcheck: @@ -611,7 +611,7 @@ software_available: check: yamllint --version 2>&1 | grep -E '[.0-9]+' all: pre: apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev python-setuptools libyaml-dev - command: pip install yamllint + command: pip install --no-cache-dir yamllint post: apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev python-setuptools libyaml-dev && rm -rf /var/lib/apt/lists/* cleanup: all: From b257ffb972d111077db459a91e1e2a132172eff9 Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 1 Nov 2018 13:55:27 +0100 Subject: [PATCH 5/6] Decrease image sizes --- Dockerfiles/mods/Dockerfile-5.2 | 288 ++++++++++++++++- Dockerfiles/mods/Dockerfile-5.3 | 316 +++++++++++++++++- Dockerfiles/mods/Dockerfile-5.4 | 320 ++++++++++++++++++- Dockerfiles/mods/Dockerfile-5.5 | 320 ++++++++++++++++++- Dockerfiles/mods/Dockerfile-5.6 | 316 +++++++++++++++++- Dockerfiles/mods/Dockerfile-7.0 | 308 +++++++++++++++++- Dockerfiles/mods/Dockerfile-7.1 | 312 +++++++++++++++++- Dockerfiles/mods/Dockerfile-7.2 | 316 +++++++++++++++++- Dockerfiles/mods/Dockerfile-7.3 | 292 ++++++++++++++++- Dockerfiles/prod/Dockerfile-5.2 | 6 +- Dockerfiles/prod/Dockerfile-5.3 | 6 +- Dockerfiles/prod/Dockerfile-5.4 | 6 +- Dockerfiles/prod/Dockerfile-5.5 | 6 +- Dockerfiles/prod/Dockerfile-5.6 | 6 +- Dockerfiles/prod/Dockerfile-7.0 | 6 +- Dockerfiles/prod/Dockerfile-7.1 | 6 +- Dockerfiles/prod/Dockerfile-7.2 | 6 +- Dockerfiles/prod/Dockerfile-7.3 | 6 +- Dockerfiles/work/Dockerfile-5.2 | 17 +- Dockerfiles/work/Dockerfile-5.3 | 17 +- Dockerfiles/work/Dockerfile-5.4 | 17 +- Dockerfiles/work/Dockerfile-5.5 | 17 +- Dockerfiles/work/Dockerfile-5.6 | 17 +- Dockerfiles/work/Dockerfile-7.0 | 17 +- Dockerfiles/work/Dockerfile-7.1 | 17 +- Dockerfiles/work/Dockerfile-7.2 | 17 +- Dockerfiles/work/Dockerfile-7.3 | 17 +- build/ansible/DOCKERFILES/Dockerfile-mods.j2 | 12 +- build/ansible/DOCKERFILES/Dockerfile-prod.j2 | 6 +- build/ansible/DOCKERFILES/Dockerfile-work.j2 | 9 +- build/ansible/group_vars/all.yml | 8 +- 31 files changed, 2960 insertions(+), 70 deletions(-) diff --git a/Dockerfiles/mods/Dockerfile-5.2 b/Dockerfiles/mods/Dockerfile-5.2 index 3b553ca4..65bcd1dd 100644 --- a/Dockerfiles/mods/Dockerfile-5.2 +++ b/Dockerfiles/mods/Dockerfile-5.2 @@ -96,19 +96,75 @@ RUN set -x \ && rm -rf ioncube \ && rm -rf ioncube.tar.gz \ \ + \ + && rm -rf /usr/local/lib/php/test/ioncube || true \ + && rm -rf /usr/local/lib/php/doc/ioncube || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install amqp-1.4.0 \ && docker-php-ext-enable amqp \ + \ + && rm -rf /usr/local/lib/php/test/amqp || true \ + && rm -rf /usr/local/lib/php/doc/amqp || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) bcmath \ + \ + && rm -rf /usr/local/lib/php/test/bcmath || true \ + && rm -rf /usr/local/lib/php/doc/bcmath || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) bz2 \ + \ + && rm -rf /usr/local/lib/php/test/bz2 || true \ + && rm -rf /usr/local/lib/php/doc/bz2 || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) calendar \ + \ + && rm -rf /usr/local/lib/php/test/calendar || true \ + && rm -rf /usr/local/lib/php/doc/calendar || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/ctype || true \ + && rm -rf /usr/local/lib/php/doc/ctype || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/curl || true \ + && rm -rf /usr/local/lib/php/doc/curl || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) dba \ + \ + && rm -rf /usr/local/lib/php/test/dba || true \ + && rm -rf /usr/local/lib/php/doc/dba || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/dom || true \ + && rm -rf /usr/local/lib/php/doc/dom || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && echo "/usr" | pecl install enchant \ && docker-php-ext-enable enchant \ + \ + && rm -rf /usr/local/lib/php/test/enchant || true \ + && rm -rf /usr/local/lib/php/doc/enchant || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) exif \ + \ + && rm -rf /usr/local/lib/php/test/exif || true \ + && rm -rf /usr/local/lib/php/doc/exif || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install fileinfo \ && docker-php-ext-enable fileinfo \ + \ + && rm -rf /usr/local/lib/php/test/fileinfo || true \ + && rm -rf /usr/local/lib/php/doc/fileinfo || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/filter || true \ + && rm -rf /usr/local/lib/php/doc/filter || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure ftp --with-openssl-dir \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) ftp \ + \ + && rm -rf /usr/local/lib/php/test/ftp || true \ + && rm -rf /usr/local/lib/php/doc/ftp || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && ln -s /usr/lib/x86_64-linux-gnu/libjpeg.* /usr/lib/ && \ ln -s /usr/lib/x86_64-linux-gnu/libpng.* /usr/lib/ && \ ln -s /usr/lib/x86_64-linux-gnu/libXpm.* /usr/lib/ && \ @@ -117,69 +173,297 @@ ln -s /usr/include/freetype2/freetype.h /usr/include/freetype2/freetype/freetype \ && /usr/local/bin/docker-php-ext-configure gd --with-gd --with-jpeg-dir=/usr --with-png-dir=/usr --with-zlib-dir=/usr --with-xpm-dir=/usr --with-freetype-dir=/usr --enable-gd-jis-conv --enable-gd-native-ttf \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gd \ + \ + && rm -rf /usr/local/lib/php/test/gd || true \ + && rm -rf /usr/local/lib/php/doc/gd || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gettext \ + \ + && rm -rf /usr/local/lib/php/test/gettext || true \ + && rm -rf /usr/local/lib/php/doc/gettext || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/hash || true \ + && rm -rf /usr/local/lib/php/doc/hash || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/iconv || true \ + && rm -rf /usr/local/lib/php/doc/iconv || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install igbinary-2.0.7 \ && docker-php-ext-enable igbinary \ + \ + && rm -rf /usr/local/lib/php/test/igbinary || true \ + && rm -rf /usr/local/lib/php/doc/igbinary || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && ln -s /usr/lib/x86_64-linux-gnu/libkrb5* /usr/lib/ \ && /usr/local/bin/docker-php-ext-configure imap --with-kerberos --with-imap-ssl --with-imap \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) imap \ + \ + && rm -rf /usr/local/lib/php/test/imap || true \ + && rm -rf /usr/local/lib/php/doc/imap || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) interbase \ + \ + && rm -rf /usr/local/lib/php/test/interbase || true \ + && rm -rf /usr/local/lib/php/doc/interbase || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install intl \ && docker-php-ext-enable intl \ + \ + && rm -rf /usr/local/lib/php/test/intl || true \ + && rm -rf /usr/local/lib/php/doc/intl || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/json || true \ + && rm -rf /usr/local/lib/php/doc/json || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && ln -s /usr/lib/x86_64-linux-gnu/libldap* /usr/lib/ \ && /usr/local/bin/docker-php-ext-configure ldap --with-ldap --with-ldap-sasl \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) ldap \ + \ + && rm -rf /usr/local/lib/php/test/ldap || true \ + && rm -rf /usr/local/lib/php/doc/ldap || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/libxml || true \ + && rm -rf /usr/local/lib/php/doc/libxml || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/mbstring || true \ + && rm -rf /usr/local/lib/php/doc/mbstring || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mcrypt \ + \ + && rm -rf /usr/local/lib/php/test/mcrypt || true \ + && rm -rf /usr/local/lib/php/doc/mcrypt || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install memcache \ && docker-php-ext-enable memcache \ + \ + && rm -rf /usr/local/lib/php/test/memcache || true \ + && rm -rf /usr/local/lib/php/doc/memcache || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install memcached-2.1.0 \ && docker-php-ext-enable memcached \ + \ + && rm -rf /usr/local/lib/php/test/memcached || true \ + && rm -rf /usr/local/lib/php/doc/memcached || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && yes | pecl install mongo-1.5.8 \ && docker-php-ext-enable mongo \ + \ + && rm -rf /usr/local/lib/php/test/mongo || true \ + && rm -rf /usr/local/lib/php/doc/mongo || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install msgpack-0.5.7 \ && docker-php-ext-enable msgpack \ + \ + && rm -rf /usr/local/lib/php/test/msgpack || true \ + && rm -rf /usr/local/lib/php/doc/msgpack || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/mysql || true \ + && rm -rf /usr/local/lib/php/doc/mysql || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/mysqli || true \ + && rm -rf /usr/local/lib/php/doc/mysqli || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install zendopcache \ && docker-php-ext-enable opcache \ + \ + && rm -rf /usr/local/lib/php/test/opcache || true \ + && rm -rf /usr/local/lib/php/doc/opcache || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/openssl || true \ + && rm -rf /usr/local/lib/php/doc/openssl || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pcntl \ + \ + && rm -rf /usr/local/lib/php/test/pcntl || true \ + && rm -rf /usr/local/lib/php/doc/pcntl || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/pcre || true \ + && rm -rf /usr/local/lib/php/doc/pcre || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/pdo || true \ + && rm -rf /usr/local/lib/php/doc/pdo || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && ln -s /usr/lib/x86_64-linux-gnu/libsybdb.* /usr/lib/ \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_dblib \ + \ + && rm -rf /usr/local/lib/php/test/pdo_dblib || true \ + && rm -rf /usr/local/lib/php/doc/pdo_dblib || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_firebird \ + \ + && rm -rf /usr/local/lib/php/test/pdo_firebird || true \ + && rm -rf /usr/local/lib/php/doc/pdo_firebird || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/pdo_mysql || true \ + && rm -rf /usr/local/lib/php/doc/pdo_mysql || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_pgsql \ + \ + && rm -rf /usr/local/lib/php/test/pdo_pgsql || true \ + && rm -rf /usr/local/lib/php/doc/pdo_pgsql || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/pdo_sqlite || true \ + && rm -rf /usr/local/lib/php/doc/pdo_sqlite || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pgsql \ + \ + && rm -rf /usr/local/lib/php/test/pgsql || true \ + && rm -rf /usr/local/lib/php/doc/pgsql || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install phar \ && docker-php-ext-enable phar \ + \ + && rm -rf /usr/local/lib/php/test/phar || true \ + && rm -rf /usr/local/lib/php/doc/phar || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/posix || true \ + && rm -rf /usr/local/lib/php/doc/posix || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pspell \ + \ + && rm -rf /usr/local/lib/php/test/pspell || true \ + && rm -rf /usr/local/lib/php/doc/pspell || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/readline || true \ + && rm -rf /usr/local/lib/php/doc/readline || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \ + \ + && rm -rf /usr/local/lib/php/test/recode || true \ + && rm -rf /usr/local/lib/php/doc/recode || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install redis-2.2.7 \ && docker-php-ext-enable redis \ + \ + && rm -rf /usr/local/lib/php/test/redis || true \ + && rm -rf /usr/local/lib/php/doc/redis || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/session || true \ + && rm -rf /usr/local/lib/php/doc/session || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) shmop \ + \ + && rm -rf /usr/local/lib/php/test/shmop || true \ + && rm -rf /usr/local/lib/php/doc/shmop || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/simplexml || true \ + && rm -rf /usr/local/lib/php/doc/simplexml || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure snmp --with-openssl-dir \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) snmp \ + \ + && rm -rf /usr/local/lib/php/test/snmp || true \ + && rm -rf /usr/local/lib/php/doc/snmp || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/soap || true \ + && rm -rf /usr/local/lib/php/doc/soap || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sockets \ + \ + && rm -rf /usr/local/lib/php/test/sockets || true \ + && rm -rf /usr/local/lib/php/doc/sockets || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvmsg \ + \ + && rm -rf /usr/local/lib/php/test/sysvmsg || true \ + && rm -rf /usr/local/lib/php/doc/sysvmsg || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvsem \ + \ + && rm -rf /usr/local/lib/php/test/sysvsem || true \ + && rm -rf /usr/local/lib/php/doc/sysvsem || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvshm \ + \ + && rm -rf /usr/local/lib/php/test/sysvshm || true \ + && rm -rf /usr/local/lib/php/doc/sysvshm || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) tidy \ + \ + && rm -rf /usr/local/lib/php/test/tidy || true \ + && rm -rf /usr/local/lib/php/doc/tidy || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/tokenizer || true \ + && rm -rf /usr/local/lib/php/doc/tokenizer || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install uploadprogress \ && docker-php-ext-enable uploadprogress \ + \ + && rm -rf /usr/local/lib/php/test/uploadprogress || true \ + && rm -rf /usr/local/lib/php/doc/uploadprogress || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure wddx --with-libxml-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) wddx \ + \ + && rm -rf /usr/local/lib/php/test/wddx || true \ + && rm -rf /usr/local/lib/php/doc/wddx || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install xdebug-2.2.7 \ && docker-php-ext-enable xdebug \ + \ + && rm -rf /usr/local/lib/php/test/xdebug || true \ + && rm -rf /usr/local/lib/php/doc/xdebug || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/xml || true \ + && rm -rf /usr/local/lib/php/doc/xml || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/xmlreader || true \ + && rm -rf /usr/local/lib/php/doc/xmlreader || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure xmlrpc --with-libxml-dir=/usr --with-iconv-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xmlrpc \ + \ + && rm -rf /usr/local/lib/php/test/xmlrpc || true \ + && rm -rf /usr/local/lib/php/doc/xmlrpc || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/xmlwriter || true \ + && rm -rf /usr/local/lib/php/doc/xmlwriter || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xsl \ + \ + && rm -rf /usr/local/lib/php/test/xsl || true \ + && rm -rf /usr/local/lib/php/doc/xsl || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure zip --with-zlib-dir=/usr --with-pcre-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) zip \ + \ + && rm -rf /usr/local/lib/php/test/zip || true \ + && rm -rf /usr/local/lib/php/doc/zip || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && rm -rf /tmp/* \ \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false ${BUILD_DEPS} \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests ${RUN_DEPS} \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ + \ && update-ca-certificates \ - && find /usr/local/{bin,lib,sbin} -type f -print0 | xargs -0r strip --strip-all -p 2>/dev/null || true \ - && find "$(php -r 'echo ini_get("extension_dir");')" -print0 | xargs -0r strip --strip-all -p 2>/dev/null || true + \ + && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find "$(php -r 'echo ini_get("extension_dir");')" -type f -exce strip --strip-all -p '{}' 2>/dev/null || true ### diff --git a/Dockerfiles/mods/Dockerfile-5.3 b/Dockerfiles/mods/Dockerfile-5.3 index 12c03fa5..76be5d59 100644 --- a/Dockerfiles/mods/Dockerfile-5.3 +++ b/Dockerfiles/mods/Dockerfile-5.3 @@ -101,101 +101,413 @@ RUN set -x \ && rm -rf ioncube \ && rm -rf ioncube.tar.gz \ \ + \ + && rm -rf /usr/local/lib/php/test/ioncube || true \ + && rm -rf /usr/local/lib/php/doc/ioncube || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && echo "/usr" | pecl install amqp \ && docker-php-ext-enable amqp \ + \ + && rm -rf /usr/local/lib/php/test/amqp || true \ + && rm -rf /usr/local/lib/php/doc/amqp || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install apcu-4.0.11 \ && docker-php-ext-enable apcu \ + \ + && rm -rf /usr/local/lib/php/test/apcu || true \ + && rm -rf /usr/local/lib/php/doc/apcu || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) bcmath \ + \ + && rm -rf /usr/local/lib/php/test/bcmath || true \ + && rm -rf /usr/local/lib/php/doc/bcmath || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) bz2 \ + \ + && rm -rf /usr/local/lib/php/test/bz2 || true \ + && rm -rf /usr/local/lib/php/doc/bz2 || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) calendar \ + \ + && rm -rf /usr/local/lib/php/test/calendar || true \ + && rm -rf /usr/local/lib/php/doc/calendar || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/ctype || true \ + && rm -rf /usr/local/lib/php/doc/ctype || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/curl || true \ + && rm -rf /usr/local/lib/php/doc/curl || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) dba \ + \ + && rm -rf /usr/local/lib/php/test/dba || true \ + && rm -rf /usr/local/lib/php/doc/dba || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/dom || true \ + && rm -rf /usr/local/lib/php/doc/dom || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) enchant \ + \ + && rm -rf /usr/local/lib/php/test/enchant || true \ + && rm -rf /usr/local/lib/php/doc/enchant || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) exif \ + \ + && rm -rf /usr/local/lib/php/test/exif || true \ + && rm -rf /usr/local/lib/php/doc/exif || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/fileinfo || true \ + && rm -rf /usr/local/lib/php/doc/fileinfo || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/filter || true \ + && rm -rf /usr/local/lib/php/doc/filter || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure ftp --with-openssl-dir \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) ftp \ + \ + && rm -rf /usr/local/lib/php/test/ftp || true \ + && rm -rf /usr/local/lib/php/doc/ftp || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && ln -s /usr/lib/x86_64-linux-gnu/libXpm.* /usr/lib/ && mkdir /usr/include/freetype2/freetype && ln -s /usr/include/freetype2/freetype.h /usr/include/freetype2/freetype/freetype.h \ && /usr/local/bin/docker-php-ext-configure gd --with-gd --with-jpeg-dir=/usr --with-png-dir=/usr --with-zlib-dir=/usr --with-xpm-dir=/usr --with-freetype-dir=/usr --enable-gd-jis-conv --enable-gd-native-ttf \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gd \ + \ + && rm -rf /usr/local/lib/php/test/gd || true \ + && rm -rf /usr/local/lib/php/doc/gd || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gettext \ + \ + && rm -rf /usr/local/lib/php/test/gettext || true \ + && rm -rf /usr/local/lib/php/doc/gettext || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && ln /usr/include/x86_64-linux-gnu/gmp.h /usr/include/ \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gmp \ + \ + && rm -rf /usr/local/lib/php/test/gmp || true \ + && rm -rf /usr/local/lib/php/doc/gmp || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/hash || true \ + && rm -rf /usr/local/lib/php/doc/hash || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/iconv || true \ + && rm -rf /usr/local/lib/php/doc/iconv || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install igbinary \ && docker-php-ext-enable igbinary \ + \ + && rm -rf /usr/local/lib/php/test/igbinary || true \ + && rm -rf /usr/local/lib/php/doc/igbinary || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install imagick-3.3.0 \ && docker-php-ext-enable imagick \ + \ + && rm -rf /usr/local/lib/php/test/imagick || true \ + && rm -rf /usr/local/lib/php/doc/imagick || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && ln -s /usr/lib/x86_64-linux-gnu/libkrb5* /usr/lib/ \ && /usr/local/bin/docker-php-ext-configure imap --with-kerberos --with-imap-ssl --with-imap \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) imap \ + \ + && rm -rf /usr/local/lib/php/test/imap || true \ + && rm -rf /usr/local/lib/php/doc/imap || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) interbase \ + \ + && rm -rf /usr/local/lib/php/test/interbase || true \ + && rm -rf /usr/local/lib/php/doc/interbase || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) intl \ + \ + && rm -rf /usr/local/lib/php/test/intl || true \ + && rm -rf /usr/local/lib/php/doc/intl || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/json || true \ + && rm -rf /usr/local/lib/php/doc/json || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && ln -s /usr/lib/x86_64-linux-gnu/libldap* /usr/lib/ \ && /usr/local/bin/docker-php-ext-configure ldap --with-ldap --with-ldap-sasl \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) ldap \ + \ + && rm -rf /usr/local/lib/php/test/ldap || true \ + && rm -rf /usr/local/lib/php/doc/ldap || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/libxml || true \ + && rm -rf /usr/local/lib/php/doc/libxml || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mbstring \ + \ + && rm -rf /usr/local/lib/php/test/mbstring || true \ + && rm -rf /usr/local/lib/php/doc/mbstring || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mcrypt \ + \ + && rm -rf /usr/local/lib/php/test/mcrypt || true \ + && rm -rf /usr/local/lib/php/doc/mcrypt || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install memcache \ && docker-php-ext-enable memcache \ + \ + && rm -rf /usr/local/lib/php/test/memcache || true \ + && rm -rf /usr/local/lib/php/doc/memcache || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install memcached-2.2.0 \ && docker-php-ext-enable memcached \ + \ + && rm -rf /usr/local/lib/php/test/memcached || true \ + && rm -rf /usr/local/lib/php/doc/memcached || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && yes | pecl install mongo \ && docker-php-ext-enable mongo \ + \ + && rm -rf /usr/local/lib/php/test/mongo || true \ + && rm -rf /usr/local/lib/php/doc/mongo || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install mongodb-0.6.3 \ && docker-php-ext-enable mongodb \ + \ + && rm -rf /usr/local/lib/php/test/mongodb || true \ + && rm -rf /usr/local/lib/php/doc/mongodb || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install msgpack-0.5.7 \ && docker-php-ext-enable msgpack \ + \ + && rm -rf /usr/local/lib/php/test/msgpack || true \ + && rm -rf /usr/local/lib/php/doc/msgpack || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/mysql || true \ + && rm -rf /usr/local/lib/php/doc/mysql || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysqli \ + \ + && rm -rf /usr/local/lib/php/test/mysqli || true \ + && rm -rf /usr/local/lib/php/doc/mysqli || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/mysqlnd || true \ + && rm -rf /usr/local/lib/php/doc/mysqlnd || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install zendopcache \ && docker-php-ext-enable opcache \ + \ + && rm -rf /usr/local/lib/php/test/opcache || true \ + && rm -rf /usr/local/lib/php/doc/opcache || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/openssl || true \ + && rm -rf /usr/local/lib/php/doc/openssl || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pcntl \ + \ + && rm -rf /usr/local/lib/php/test/pcntl || true \ + && rm -rf /usr/local/lib/php/doc/pcntl || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/pcre || true \ + && rm -rf /usr/local/lib/php/doc/pcre || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/pdo || true \ + && rm -rf /usr/local/lib/php/doc/pdo || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && ln -s /usr/lib/x86_64-linux-gnu/libsybdb.* /usr/lib/ \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_dblib \ + \ + && rm -rf /usr/local/lib/php/test/pdo_dblib || true \ + && rm -rf /usr/local/lib/php/doc/pdo_dblib || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_firebird \ + \ + && rm -rf /usr/local/lib/php/test/pdo_firebird || true \ + && rm -rf /usr/local/lib/php/doc/pdo_firebird || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure pdo_mysql --with-zlib-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_mysql \ + \ + && rm -rf /usr/local/lib/php/test/pdo_mysql || true \ + && rm -rf /usr/local/lib/php/doc/pdo_mysql || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_pgsql \ + \ + && rm -rf /usr/local/lib/php/test/pdo_pgsql || true \ + && rm -rf /usr/local/lib/php/doc/pdo_pgsql || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/pdo_sqlite || true \ + && rm -rf /usr/local/lib/php/doc/pdo_sqlite || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pgsql \ + \ + && rm -rf /usr/local/lib/php/test/pgsql || true \ + && rm -rf /usr/local/lib/php/doc/pgsql || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && git clone -v https://github.com/phalcon/cphalcon /tmp/phalcon \ && cd /tmp/phalcon \ && git checkout phalcon-v2.0.9 \ && cd build && ./install \ && docker-php-ext-enable phalcon \ + \ + && rm -rf /usr/local/lib/php/test/phalcon || true \ + && rm -rf /usr/local/lib/php/doc/phalcon || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/phar || true \ + && rm -rf /usr/local/lib/php/doc/phar || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/posix || true \ + && rm -rf /usr/local/lib/php/doc/posix || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pspell \ + \ + && rm -rf /usr/local/lib/php/test/pspell || true \ + && rm -rf /usr/local/lib/php/doc/pspell || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/recode || true \ + && rm -rf /usr/local/lib/php/doc/recode || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install redis \ && docker-php-ext-enable redis \ + \ + && rm -rf /usr/local/lib/php/test/redis || true \ + && rm -rf /usr/local/lib/php/doc/redis || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install rdkafka \ && docker-php-ext-enable rdkafka \ + \ + && rm -rf /usr/local/lib/php/test/rdkafka || true \ + && rm -rf /usr/local/lib/php/doc/rdkafka || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/session || true \ + && rm -rf /usr/local/lib/php/doc/session || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) shmop \ + \ + && rm -rf /usr/local/lib/php/test/shmop || true \ + && rm -rf /usr/local/lib/php/doc/shmop || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/simplexml || true \ + && rm -rf /usr/local/lib/php/doc/simplexml || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure snmp --with-openssl-dir \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) snmp \ + \ + && rm -rf /usr/local/lib/php/test/snmp || true \ + && rm -rf /usr/local/lib/php/doc/snmp || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure soap --with-libxml-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) soap \ + \ + && rm -rf /usr/local/lib/php/test/soap || true \ + && rm -rf /usr/local/lib/php/doc/soap || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sockets \ + \ + && rm -rf /usr/local/lib/php/test/sockets || true \ + && rm -rf /usr/local/lib/php/doc/sockets || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install swoole-1.9.23 \ && docker-php-ext-enable swoole \ + \ + && rm -rf /usr/local/lib/php/test/swoole || true \ + && rm -rf /usr/local/lib/php/doc/swoole || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvmsg \ + \ + && rm -rf /usr/local/lib/php/test/sysvmsg || true \ + && rm -rf /usr/local/lib/php/doc/sysvmsg || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvsem \ + \ + && rm -rf /usr/local/lib/php/test/sysvsem || true \ + && rm -rf /usr/local/lib/php/doc/sysvsem || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvshm \ + \ + && rm -rf /usr/local/lib/php/test/sysvshm || true \ + && rm -rf /usr/local/lib/php/doc/sysvshm || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) tidy \ + \ + && rm -rf /usr/local/lib/php/test/tidy || true \ + && rm -rf /usr/local/lib/php/doc/tidy || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/tokenizer || true \ + && rm -rf /usr/local/lib/php/doc/tokenizer || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install uploadprogress \ && docker-php-ext-enable uploadprogress \ + \ + && rm -rf /usr/local/lib/php/test/uploadprogress || true \ + && rm -rf /usr/local/lib/php/doc/uploadprogress || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure wddx --with-libxml-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) wddx \ + \ + && rm -rf /usr/local/lib/php/test/wddx || true \ + && rm -rf /usr/local/lib/php/doc/wddx || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install xdebug-2.2.7 \ && docker-php-ext-enable xdebug \ + \ + && rm -rf /usr/local/lib/php/test/xdebug || true \ + && rm -rf /usr/local/lib/php/doc/xdebug || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/xml || true \ + && rm -rf /usr/local/lib/php/doc/xml || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/xmlreader || true \ + && rm -rf /usr/local/lib/php/doc/xmlreader || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure xmlrpc --with-libxml-dir=/usr --with-iconv-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xmlrpc \ + \ + && rm -rf /usr/local/lib/php/test/xmlrpc || true \ + && rm -rf /usr/local/lib/php/doc/xmlrpc || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/xmlwriter || true \ + && rm -rf /usr/local/lib/php/doc/xmlwriter || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xsl \ + \ + && rm -rf /usr/local/lib/php/test/xsl || true \ + && rm -rf /usr/local/lib/php/doc/xsl || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure zip --with-zlib-dir=/usr --with-pcre-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) zip \ + \ + && rm -rf /usr/local/lib/php/test/zip || true \ + && rm -rf /usr/local/lib/php/doc/zip || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && rm -rf /tmp/* \ \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false ${BUILD_DEPS} \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests ${RUN_DEPS} \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ + \ && update-ca-certificates \ - && find /usr/local/{bin,lib,sbin} -type f -print0 | xargs -0r strip --strip-all -p 2>/dev/null || true \ - && find "$(php -r 'echo ini_get("extension_dir");')" -print0 | xargs -0r strip --strip-all -p 2>/dev/null || true + \ + && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find "$(php -r 'echo ini_get("extension_dir");')" -type f -exce strip --strip-all -p '{}' 2>/dev/null || true ### diff --git a/Dockerfiles/mods/Dockerfile-5.4 b/Dockerfiles/mods/Dockerfile-5.4 index 40c7ec1f..73c89179 100644 --- a/Dockerfiles/mods/Dockerfile-5.4 +++ b/Dockerfiles/mods/Dockerfile-5.4 @@ -101,102 +101,418 @@ RUN set -x \ && rm -rf ioncube \ && rm -rf ioncube.tar.gz \ \ + \ + && rm -rf /usr/local/lib/php/test/ioncube || true \ + && rm -rf /usr/local/lib/php/doc/ioncube || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && echo "/usr" | pecl install amqp \ && docker-php-ext-enable amqp \ + \ + && rm -rf /usr/local/lib/php/test/amqp || true \ + && rm -rf /usr/local/lib/php/doc/amqp || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install apcu-4.0.11 \ && docker-php-ext-enable apcu \ + \ + && rm -rf /usr/local/lib/php/test/apcu || true \ + && rm -rf /usr/local/lib/php/doc/apcu || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install bcmath \ + \ + && rm -rf /usr/local/lib/php/test/bcmath || true \ + && rm -rf /usr/local/lib/php/doc/bcmath || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install bz2 \ + \ + && rm -rf /usr/local/lib/php/test/bz2 || true \ + && rm -rf /usr/local/lib/php/doc/bz2 || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install calendar \ + \ + && rm -rf /usr/local/lib/php/test/calendar || true \ + && rm -rf /usr/local/lib/php/doc/calendar || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/ctype || true \ + && rm -rf /usr/local/lib/php/doc/ctype || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/curl || true \ + && rm -rf /usr/local/lib/php/doc/curl || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install dba \ + \ + && rm -rf /usr/local/lib/php/test/dba || true \ + && rm -rf /usr/local/lib/php/doc/dba || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/dom || true \ + && rm -rf /usr/local/lib/php/doc/dom || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install enchant \ + \ + && rm -rf /usr/local/lib/php/test/enchant || true \ + && rm -rf /usr/local/lib/php/doc/enchant || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install exif \ + \ + && rm -rf /usr/local/lib/php/test/exif || true \ + && rm -rf /usr/local/lib/php/doc/exif || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/fileinfo || true \ + && rm -rf /usr/local/lib/php/doc/fileinfo || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/filter || true \ + && rm -rf /usr/local/lib/php/doc/filter || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure ftp --with-openssl-dir \ && /usr/local/bin/docker-php-ext-install ftp \ + \ + && rm -rf /usr/local/lib/php/test/ftp || true \ + && rm -rf /usr/local/lib/php/doc/ftp || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && ln -s /usr/lib/x86_64-linux-gnu/libXpm.* /usr/lib/ \ && /usr/local/bin/docker-php-ext-configure gd --with-gd --with-vpx-dir=/usr --with-jpeg-dir=/usr --with-png-dir=/usr --with-zlib-dir=/usr --with-xpm-dir=/usr --with-freetype-dir=/usr --enable-gd-jis-conv --enable-gd-native-ttf \ && /usr/local/bin/docker-php-ext-install gd \ + \ + && rm -rf /usr/local/lib/php/test/gd || true \ + && rm -rf /usr/local/lib/php/doc/gd || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install gettext \ + \ + && rm -rf /usr/local/lib/php/test/gettext || true \ + && rm -rf /usr/local/lib/php/doc/gettext || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && ln /usr/include/x86_64-linux-gnu/gmp.h /usr/include/ \ && /usr/local/bin/docker-php-ext-install gmp \ + \ + && rm -rf /usr/local/lib/php/test/gmp || true \ + && rm -rf /usr/local/lib/php/doc/gmp || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/hash || true \ + && rm -rf /usr/local/lib/php/doc/hash || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/iconv || true \ + && rm -rf /usr/local/lib/php/doc/iconv || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install igbinary \ && docker-php-ext-enable igbinary \ + \ + && rm -rf /usr/local/lib/php/test/igbinary || true \ + && rm -rf /usr/local/lib/php/doc/igbinary || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install imagick \ && docker-php-ext-enable imagick \ + \ + && rm -rf /usr/local/lib/php/test/imagick || true \ + && rm -rf /usr/local/lib/php/doc/imagick || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && ln -s /usr/lib/x86_64-linux-gnu/libkrb5* /usr/lib/ \ && /usr/local/bin/docker-php-ext-configure imap --with-kerberos --with-imap-ssl --with-imap \ && /usr/local/bin/docker-php-ext-install imap \ + \ + && rm -rf /usr/local/lib/php/test/imap || true \ + && rm -rf /usr/local/lib/php/doc/imap || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install interbase \ + \ + && rm -rf /usr/local/lib/php/test/interbase || true \ + && rm -rf /usr/local/lib/php/doc/interbase || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install intl \ + \ + && rm -rf /usr/local/lib/php/test/intl || true \ + && rm -rf /usr/local/lib/php/doc/intl || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/json || true \ + && rm -rf /usr/local/lib/php/doc/json || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && ln -s /usr/lib/x86_64-linux-gnu/libldap* /usr/lib/ \ && /usr/local/bin/docker-php-ext-configure ldap --with-ldap --with-ldap-sasl \ && /usr/local/bin/docker-php-ext-install ldap \ + \ + && rm -rf /usr/local/lib/php/test/ldap || true \ + && rm -rf /usr/local/lib/php/doc/ldap || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/libxml || true \ + && rm -rf /usr/local/lib/php/doc/libxml || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install mbstring \ + \ + && rm -rf /usr/local/lib/php/test/mbstring || true \ + && rm -rf /usr/local/lib/php/doc/mbstring || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install mcrypt \ + \ + && rm -rf /usr/local/lib/php/test/mcrypt || true \ + && rm -rf /usr/local/lib/php/doc/mcrypt || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install memcache \ && docker-php-ext-enable memcache \ + \ + && rm -rf /usr/local/lib/php/test/memcache || true \ + && rm -rf /usr/local/lib/php/doc/memcache || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install memcached-2.2.0 \ && docker-php-ext-enable memcached \ + \ + && rm -rf /usr/local/lib/php/test/memcached || true \ + && rm -rf /usr/local/lib/php/doc/memcached || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && yes | pecl install mongo \ && docker-php-ext-enable mongo \ + \ + && rm -rf /usr/local/lib/php/test/mongo || true \ + && rm -rf /usr/local/lib/php/doc/mongo || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install mongodb-1.2.11 \ && docker-php-ext-enable mongodb \ + \ + && rm -rf /usr/local/lib/php/test/mongodb || true \ + && rm -rf /usr/local/lib/php/doc/mongodb || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install msgpack-0.5.7 \ && docker-php-ext-enable msgpack \ + \ + && rm -rf /usr/local/lib/php/test/msgpack || true \ + && rm -rf /usr/local/lib/php/doc/msgpack || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install mysql \ + \ + && rm -rf /usr/local/lib/php/test/mysql || true \ + && rm -rf /usr/local/lib/php/doc/mysql || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install mysqli \ + \ + && rm -rf /usr/local/lib/php/test/mysqli || true \ + && rm -rf /usr/local/lib/php/doc/mysqli || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/mysqlnd || true \ + && rm -rf /usr/local/lib/php/doc/mysqlnd || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install zendopcache \ && docker-php-ext-enable opcache \ + \ + && rm -rf /usr/local/lib/php/test/opcache || true \ + && rm -rf /usr/local/lib/php/doc/opcache || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/openssl || true \ + && rm -rf /usr/local/lib/php/doc/openssl || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install pcntl \ + \ + && rm -rf /usr/local/lib/php/test/pcntl || true \ + && rm -rf /usr/local/lib/php/doc/pcntl || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/pcre || true \ + && rm -rf /usr/local/lib/php/doc/pcre || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/pdo || true \ + && rm -rf /usr/local/lib/php/doc/pdo || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && ln -s /usr/lib/x86_64-linux-gnu/libsybdb.* /usr/lib/ \ && /usr/local/bin/docker-php-ext-install pdo_dblib \ + \ + && rm -rf /usr/local/lib/php/test/pdo_dblib || true \ + && rm -rf /usr/local/lib/php/doc/pdo_dblib || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install pdo_firebird \ + \ + && rm -rf /usr/local/lib/php/test/pdo_firebird || true \ + && rm -rf /usr/local/lib/php/doc/pdo_firebird || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure pdo_mysql --with-zlib-dir=/usr \ && /usr/local/bin/docker-php-ext-install pdo_mysql \ + \ + && rm -rf /usr/local/lib/php/test/pdo_mysql || true \ + && rm -rf /usr/local/lib/php/doc/pdo_mysql || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install pdo_pgsql \ + \ + && rm -rf /usr/local/lib/php/test/pdo_pgsql || true \ + && rm -rf /usr/local/lib/php/doc/pdo_pgsql || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/pdo_sqlite || true \ + && rm -rf /usr/local/lib/php/doc/pdo_sqlite || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install pgsql \ + \ + && rm -rf /usr/local/lib/php/test/pgsql || true \ + && rm -rf /usr/local/lib/php/doc/pgsql || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && git clone -v https://github.com/phalcon/cphalcon /tmp/phalcon \ && cd /tmp/phalcon \ && git checkout phalcon-v2.0.13 \ && cd build && ./install \ && docker-php-ext-enable phalcon \ + \ + && rm -rf /usr/local/lib/php/test/phalcon || true \ + && rm -rf /usr/local/lib/php/doc/phalcon || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/phar || true \ + && rm -rf /usr/local/lib/php/doc/phar || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/posix || true \ + && rm -rf /usr/local/lib/php/doc/posix || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install pspell \ + \ + && rm -rf /usr/local/lib/php/test/pspell || true \ + && rm -rf /usr/local/lib/php/doc/pspell || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/readline || true \ + && rm -rf /usr/local/lib/php/doc/readline || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/recode || true \ + && rm -rf /usr/local/lib/php/doc/recode || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install redis \ && docker-php-ext-enable redis \ + \ + && rm -rf /usr/local/lib/php/test/redis || true \ + && rm -rf /usr/local/lib/php/doc/redis || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install rdkafka \ && docker-php-ext-enable rdkafka \ + \ + && rm -rf /usr/local/lib/php/test/rdkafka || true \ + && rm -rf /usr/local/lib/php/doc/rdkafka || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/session || true \ + && rm -rf /usr/local/lib/php/doc/session || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install shmop \ + \ + && rm -rf /usr/local/lib/php/test/shmop || true \ + && rm -rf /usr/local/lib/php/doc/shmop || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/simplexml || true \ + && rm -rf /usr/local/lib/php/doc/simplexml || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure snmp --with-openssl-dir \ && /usr/local/bin/docker-php-ext-install snmp \ + \ + && rm -rf /usr/local/lib/php/test/snmp || true \ + && rm -rf /usr/local/lib/php/doc/snmp || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure soap --with-libxml-dir=/usr \ && /usr/local/bin/docker-php-ext-install soap \ + \ + && rm -rf /usr/local/lib/php/test/soap || true \ + && rm -rf /usr/local/lib/php/doc/soap || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install sockets \ + \ + && rm -rf /usr/local/lib/php/test/sockets || true \ + && rm -rf /usr/local/lib/php/doc/sockets || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install swoole-1.9.23 \ && docker-php-ext-enable swoole \ + \ + && rm -rf /usr/local/lib/php/test/swoole || true \ + && rm -rf /usr/local/lib/php/doc/swoole || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install sysvmsg \ + \ + && rm -rf /usr/local/lib/php/test/sysvmsg || true \ + && rm -rf /usr/local/lib/php/doc/sysvmsg || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install sysvsem \ + \ + && rm -rf /usr/local/lib/php/test/sysvsem || true \ + && rm -rf /usr/local/lib/php/doc/sysvsem || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install sysvshm \ + \ + && rm -rf /usr/local/lib/php/test/sysvshm || true \ + && rm -rf /usr/local/lib/php/doc/sysvshm || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install tidy \ + \ + && rm -rf /usr/local/lib/php/test/tidy || true \ + && rm -rf /usr/local/lib/php/doc/tidy || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/tokenizer || true \ + && rm -rf /usr/local/lib/php/doc/tokenizer || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install uploadprogress \ && docker-php-ext-enable uploadprogress \ + \ + && rm -rf /usr/local/lib/php/test/uploadprogress || true \ + && rm -rf /usr/local/lib/php/doc/uploadprogress || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure wddx --with-libxml-dir=/usr \ && /usr/local/bin/docker-php-ext-install wddx \ + \ + && rm -rf /usr/local/lib/php/test/wddx || true \ + && rm -rf /usr/local/lib/php/doc/wddx || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install xdebug-2.4.1 \ && docker-php-ext-enable xdebug \ + \ + && rm -rf /usr/local/lib/php/test/xdebug || true \ + && rm -rf /usr/local/lib/php/doc/xdebug || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/xml || true \ + && rm -rf /usr/local/lib/php/doc/xml || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/xmlreader || true \ + && rm -rf /usr/local/lib/php/doc/xmlreader || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure xmlrpc --with-libxml-dir=/usr --with-iconv-dir=/usr \ && /usr/local/bin/docker-php-ext-install xmlrpc \ + \ + && rm -rf /usr/local/lib/php/test/xmlrpc || true \ + && rm -rf /usr/local/lib/php/doc/xmlrpc || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/xmlwriter || true \ + && rm -rf /usr/local/lib/php/doc/xmlwriter || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install xsl \ + \ + && rm -rf /usr/local/lib/php/test/xsl || true \ + && rm -rf /usr/local/lib/php/doc/xsl || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure zip --with-zlib-dir=/usr --with-pcre-dir=/usr \ && /usr/local/bin/docker-php-ext-install zip \ + \ + && rm -rf /usr/local/lib/php/test/zip || true \ + && rm -rf /usr/local/lib/php/doc/zip || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && rm -rf /tmp/* \ \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false ${BUILD_DEPS} \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests ${RUN_DEPS} \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ + \ && update-ca-certificates \ - && find /usr/local/{bin,lib,sbin} -type f -print0 | xargs -0r strip --strip-all -p 2>/dev/null || true \ - && find "$(php -r 'echo ini_get("extension_dir");')" -print0 | xargs -0r strip --strip-all -p 2>/dev/null || true + \ + && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find "$(php -r 'echo ini_get("extension_dir");')" -type f -exce strip --strip-all -p '{}' 2>/dev/null || true ### diff --git a/Dockerfiles/mods/Dockerfile-5.5 b/Dockerfiles/mods/Dockerfile-5.5 index d68196e3..cce83ec2 100644 --- a/Dockerfiles/mods/Dockerfile-5.5 +++ b/Dockerfiles/mods/Dockerfile-5.5 @@ -102,99 +102,415 @@ RUN set -x \ && rm -rf ioncube \ && rm -rf ioncube.tar.gz \ \ + \ + && rm -rf /usr/local/lib/php/test/ioncube || true \ + && rm -rf /usr/local/lib/php/doc/ioncube || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && echo "/usr" | pecl install amqp \ && docker-php-ext-enable amqp \ + \ + && rm -rf /usr/local/lib/php/test/amqp || true \ + && rm -rf /usr/local/lib/php/doc/amqp || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install apcu-4.0.11 \ && docker-php-ext-enable apcu \ + \ + && rm -rf /usr/local/lib/php/test/apcu || true \ + && rm -rf /usr/local/lib/php/doc/apcu || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) bcmath \ + \ + && rm -rf /usr/local/lib/php/test/bcmath || true \ + && rm -rf /usr/local/lib/php/doc/bcmath || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) bz2 \ + \ + && rm -rf /usr/local/lib/php/test/bz2 || true \ + && rm -rf /usr/local/lib/php/doc/bz2 || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) calendar \ + \ + && rm -rf /usr/local/lib/php/test/calendar || true \ + && rm -rf /usr/local/lib/php/doc/calendar || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/ctype || true \ + && rm -rf /usr/local/lib/php/doc/ctype || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/curl || true \ + && rm -rf /usr/local/lib/php/doc/curl || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) dba \ + \ + && rm -rf /usr/local/lib/php/test/dba || true \ + && rm -rf /usr/local/lib/php/doc/dba || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/dom || true \ + && rm -rf /usr/local/lib/php/doc/dom || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) enchant \ + \ + && rm -rf /usr/local/lib/php/test/enchant || true \ + && rm -rf /usr/local/lib/php/doc/enchant || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) exif \ + \ + && rm -rf /usr/local/lib/php/test/exif || true \ + && rm -rf /usr/local/lib/php/doc/exif || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/fileinfo || true \ + && rm -rf /usr/local/lib/php/doc/fileinfo || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/filter || true \ + && rm -rf /usr/local/lib/php/doc/filter || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/ftp || true \ + && rm -rf /usr/local/lib/php/doc/ftp || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && ln -s /usr/lib/x86_64-linux-gnu/libXpm.* /usr/lib/ \ && /usr/local/bin/docker-php-ext-configure gd --with-gd --with-vpx-dir=/usr --with-jpeg-dir=/usr --with-png-dir=/usr --with-zlib-dir=/usr --with-xpm-dir=/usr --with-freetype-dir=/usr --enable-gd-jis-conv --enable-gd-native-ttf \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gd \ + \ + && rm -rf /usr/local/lib/php/test/gd || true \ + && rm -rf /usr/local/lib/php/doc/gd || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gettext \ + \ + && rm -rf /usr/local/lib/php/test/gettext || true \ + && rm -rf /usr/local/lib/php/doc/gettext || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && ln /usr/include/x86_64-linux-gnu/gmp.h /usr/include/ \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gmp \ + \ + && rm -rf /usr/local/lib/php/test/gmp || true \ + && rm -rf /usr/local/lib/php/doc/gmp || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/hash || true \ + && rm -rf /usr/local/lib/php/doc/hash || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/iconv || true \ + && rm -rf /usr/local/lib/php/doc/iconv || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install igbinary \ && docker-php-ext-enable igbinary \ + \ + && rm -rf /usr/local/lib/php/test/igbinary || true \ + && rm -rf /usr/local/lib/php/doc/igbinary || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install imagick \ && docker-php-ext-enable imagick \ + \ + && rm -rf /usr/local/lib/php/test/imagick || true \ + && rm -rf /usr/local/lib/php/doc/imagick || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && ln -s /usr/lib/x86_64-linux-gnu/libkrb5* /usr/lib/ \ && /usr/local/bin/docker-php-ext-configure imap --with-kerberos --with-imap-ssl --with-imap \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) imap \ + \ + && rm -rf /usr/local/lib/php/test/imap || true \ + && rm -rf /usr/local/lib/php/doc/imap || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) interbase \ + \ + && rm -rf /usr/local/lib/php/test/interbase || true \ + && rm -rf /usr/local/lib/php/doc/interbase || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) intl \ + \ + && rm -rf /usr/local/lib/php/test/intl || true \ + && rm -rf /usr/local/lib/php/doc/intl || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/json || true \ + && rm -rf /usr/local/lib/php/doc/json || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && ln -s /usr/lib/x86_64-linux-gnu/libldap* /usr/lib/ \ && /usr/local/bin/docker-php-ext-configure ldap --with-ldap --with-ldap-sasl \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) ldap \ + \ + && rm -rf /usr/local/lib/php/test/ldap || true \ + && rm -rf /usr/local/lib/php/doc/ldap || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/libxml || true \ + && rm -rf /usr/local/lib/php/doc/libxml || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/mbstring || true \ + && rm -rf /usr/local/lib/php/doc/mbstring || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mcrypt \ + \ + && rm -rf /usr/local/lib/php/test/mcrypt || true \ + && rm -rf /usr/local/lib/php/doc/mcrypt || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install memcache \ && docker-php-ext-enable memcache \ + \ + && rm -rf /usr/local/lib/php/test/memcache || true \ + && rm -rf /usr/local/lib/php/doc/memcache || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install memcached-2.2.0 \ && docker-php-ext-enable memcached \ + \ + && rm -rf /usr/local/lib/php/test/memcached || true \ + && rm -rf /usr/local/lib/php/doc/memcached || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && yes | pecl install mongo \ && docker-php-ext-enable mongo \ + \ + && rm -rf /usr/local/lib/php/test/mongo || true \ + && rm -rf /usr/local/lib/php/doc/mongo || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install mongodb \ && docker-php-ext-enable mongodb \ + \ + && rm -rf /usr/local/lib/php/test/mongodb || true \ + && rm -rf /usr/local/lib/php/doc/mongodb || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install msgpack-0.5.7 \ && docker-php-ext-enable msgpack \ + \ + && rm -rf /usr/local/lib/php/test/msgpack || true \ + && rm -rf /usr/local/lib/php/doc/msgpack || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysql \ + \ + && rm -rf /usr/local/lib/php/test/mysql || true \ + && rm -rf /usr/local/lib/php/doc/mysql || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysqli \ + \ + && rm -rf /usr/local/lib/php/test/mysqli || true \ + && rm -rf /usr/local/lib/php/doc/mysqli || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/mysqlnd || true \ + && rm -rf /usr/local/lib/php/doc/mysqlnd || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) opcache \ + \ + && rm -rf /usr/local/lib/php/test/opcache || true \ + && rm -rf /usr/local/lib/php/doc/opcache || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/openssl || true \ + && rm -rf /usr/local/lib/php/doc/openssl || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pcntl \ + \ + && rm -rf /usr/local/lib/php/test/pcntl || true \ + && rm -rf /usr/local/lib/php/doc/pcntl || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/pcre || true \ + && rm -rf /usr/local/lib/php/doc/pcre || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/pdo || true \ + && rm -rf /usr/local/lib/php/doc/pdo || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && ln -s /usr/lib/x86_64-linux-gnu/libsybdb.* /usr/lib/ \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_dblib \ + \ + && rm -rf /usr/local/lib/php/test/pdo_dblib || true \ + && rm -rf /usr/local/lib/php/doc/pdo_dblib || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_firebird \ + \ + && rm -rf /usr/local/lib/php/test/pdo_firebird || true \ + && rm -rf /usr/local/lib/php/doc/pdo_firebird || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure pdo_mysql --with-zlib-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_mysql \ + \ + && rm -rf /usr/local/lib/php/test/pdo_mysql || true \ + && rm -rf /usr/local/lib/php/doc/pdo_mysql || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_pgsql \ + \ + && rm -rf /usr/local/lib/php/test/pdo_pgsql || true \ + && rm -rf /usr/local/lib/php/doc/pdo_pgsql || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/pdo_sqlite || true \ + && rm -rf /usr/local/lib/php/doc/pdo_sqlite || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pgsql \ + \ + && rm -rf /usr/local/lib/php/test/pgsql || true \ + && rm -rf /usr/local/lib/php/doc/pgsql || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && git clone -v https://github.com/phalcon/cphalcon /tmp/phalcon \ && cd /tmp/phalcon \ && git checkout $(git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | tail -1 | sed 's/^.*tags\///g') \ && cd build && ./install \ && docker-php-ext-enable phalcon \ + \ + && rm -rf /usr/local/lib/php/test/phalcon || true \ + && rm -rf /usr/local/lib/php/doc/phalcon || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/phar || true \ + && rm -rf /usr/local/lib/php/doc/phar || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/posix || true \ + && rm -rf /usr/local/lib/php/doc/posix || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pspell \ + \ + && rm -rf /usr/local/lib/php/test/pspell || true \ + && rm -rf /usr/local/lib/php/doc/pspell || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/readline || true \ + && rm -rf /usr/local/lib/php/doc/readline || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \ + \ + && rm -rf /usr/local/lib/php/test/recode || true \ + && rm -rf /usr/local/lib/php/doc/recode || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install redis \ && docker-php-ext-enable redis \ + \ + && rm -rf /usr/local/lib/php/test/redis || true \ + && rm -rf /usr/local/lib/php/doc/redis || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install rdkafka \ && docker-php-ext-enable rdkafka \ + \ + && rm -rf /usr/local/lib/php/test/rdkafka || true \ + && rm -rf /usr/local/lib/php/doc/rdkafka || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/session || true \ + && rm -rf /usr/local/lib/php/doc/session || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) shmop \ + \ + && rm -rf /usr/local/lib/php/test/shmop || true \ + && rm -rf /usr/local/lib/php/doc/shmop || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/simplexml || true \ + && rm -rf /usr/local/lib/php/doc/simplexml || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure snmp --with-openssl-dir \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) snmp \ + \ + && rm -rf /usr/local/lib/php/test/snmp || true \ + && rm -rf /usr/local/lib/php/doc/snmp || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure soap --with-libxml-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) soap \ + \ + && rm -rf /usr/local/lib/php/test/soap || true \ + && rm -rf /usr/local/lib/php/doc/soap || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sockets \ + \ + && rm -rf /usr/local/lib/php/test/sockets || true \ + && rm -rf /usr/local/lib/php/doc/sockets || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install swoole-1.9.23 \ && docker-php-ext-enable swoole \ + \ + && rm -rf /usr/local/lib/php/test/swoole || true \ + && rm -rf /usr/local/lib/php/doc/swoole || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvmsg \ + \ + && rm -rf /usr/local/lib/php/test/sysvmsg || true \ + && rm -rf /usr/local/lib/php/doc/sysvmsg || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvsem \ + \ + && rm -rf /usr/local/lib/php/test/sysvsem || true \ + && rm -rf /usr/local/lib/php/doc/sysvsem || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvshm \ + \ + && rm -rf /usr/local/lib/php/test/sysvshm || true \ + && rm -rf /usr/local/lib/php/doc/sysvshm || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) tidy \ + \ + && rm -rf /usr/local/lib/php/test/tidy || true \ + && rm -rf /usr/local/lib/php/doc/tidy || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/tokenizer || true \ + && rm -rf /usr/local/lib/php/doc/tokenizer || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install uploadprogress \ && docker-php-ext-enable uploadprogress \ + \ + && rm -rf /usr/local/lib/php/test/uploadprogress || true \ + && rm -rf /usr/local/lib/php/doc/uploadprogress || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure wddx --with-libxml-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) wddx \ + \ + && rm -rf /usr/local/lib/php/test/wddx || true \ + && rm -rf /usr/local/lib/php/doc/wddx || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install xdebug-2.4.1 \ && docker-php-ext-enable xdebug \ + \ + && rm -rf /usr/local/lib/php/test/xdebug || true \ + && rm -rf /usr/local/lib/php/doc/xdebug || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/xml || true \ + && rm -rf /usr/local/lib/php/doc/xml || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/xmlreader || true \ + && rm -rf /usr/local/lib/php/doc/xmlreader || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure xmlrpc --with-libxml-dir=/usr --with-iconv-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xmlrpc \ + \ + && rm -rf /usr/local/lib/php/test/xmlrpc || true \ + && rm -rf /usr/local/lib/php/doc/xmlrpc || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/xmlwriter || true \ + && rm -rf /usr/local/lib/php/doc/xmlwriter || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xsl \ + \ + && rm -rf /usr/local/lib/php/test/xsl || true \ + && rm -rf /usr/local/lib/php/doc/xsl || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure zip --with-zlib-dir=/usr --with-pcre-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) zip \ + \ + && rm -rf /usr/local/lib/php/test/zip || true \ + && rm -rf /usr/local/lib/php/doc/zip || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && rm -rf /tmp/* \ \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false ${BUILD_DEPS} \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests ${RUN_DEPS} \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ + \ && update-ca-certificates \ - && find /usr/local/{bin,lib,sbin} -type f -print0 | xargs -0r strip --strip-all -p 2>/dev/null || true \ - && find "$(php -r 'echo ini_get("extension_dir");')" -print0 | xargs -0r strip --strip-all -p 2>/dev/null || true + \ + && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find "$(php -r 'echo ini_get("extension_dir");')" -type f -exce strip --strip-all -p '{}' 2>/dev/null || true ### diff --git a/Dockerfiles/mods/Dockerfile-5.6 b/Dockerfiles/mods/Dockerfile-5.6 index 75fb6ee0..0db79e5e 100644 --- a/Dockerfiles/mods/Dockerfile-5.6 +++ b/Dockerfiles/mods/Dockerfile-5.6 @@ -106,99 +106,411 @@ RUN set -x \ && rm -rf ioncube \ && rm -rf ioncube.tar.gz \ \ + \ + && rm -rf /usr/local/lib/php/test/ioncube || true \ + && rm -rf /usr/local/lib/php/doc/ioncube || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && echo "/usr" | pecl install amqp \ && docker-php-ext-enable amqp \ + \ + && rm -rf /usr/local/lib/php/test/amqp || true \ + && rm -rf /usr/local/lib/php/doc/amqp || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install apcu-4.0.11 \ && docker-php-ext-enable apcu \ + \ + && rm -rf /usr/local/lib/php/test/apcu || true \ + && rm -rf /usr/local/lib/php/doc/apcu || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) bcmath \ + \ + && rm -rf /usr/local/lib/php/test/bcmath || true \ + && rm -rf /usr/local/lib/php/doc/bcmath || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) bz2 \ + \ + && rm -rf /usr/local/lib/php/test/bz2 || true \ + && rm -rf /usr/local/lib/php/doc/bz2 || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) calendar \ + \ + && rm -rf /usr/local/lib/php/test/calendar || true \ + && rm -rf /usr/local/lib/php/doc/calendar || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/ctype || true \ + && rm -rf /usr/local/lib/php/doc/ctype || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/curl || true \ + && rm -rf /usr/local/lib/php/doc/curl || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) dba \ + \ + && rm -rf /usr/local/lib/php/test/dba || true \ + && rm -rf /usr/local/lib/php/doc/dba || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/dom || true \ + && rm -rf /usr/local/lib/php/doc/dom || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) enchant \ + \ + && rm -rf /usr/local/lib/php/test/enchant || true \ + && rm -rf /usr/local/lib/php/doc/enchant || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) exif \ + \ + && rm -rf /usr/local/lib/php/test/exif || true \ + && rm -rf /usr/local/lib/php/doc/exif || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/fileinfo || true \ + && rm -rf /usr/local/lib/php/doc/fileinfo || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/filter || true \ + && rm -rf /usr/local/lib/php/doc/filter || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/ftp || true \ + && rm -rf /usr/local/lib/php/doc/ftp || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && ln -s /usr/lib/x86_64-linux-gnu/libXpm.* /usr/lib/ \ && /usr/local/bin/docker-php-ext-configure gd --with-gd --with-vpx-dir=/usr --with-jpeg-dir=/usr --with-png-dir=/usr --with-zlib-dir=/usr --with-xpm-dir=/usr --with-freetype-dir=/usr --enable-gd-jis-conv --enable-gd-native-ttf \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gd \ + \ + && rm -rf /usr/local/lib/php/test/gd || true \ + && rm -rf /usr/local/lib/php/doc/gd || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gettext \ + \ + && rm -rf /usr/local/lib/php/test/gettext || true \ + && rm -rf /usr/local/lib/php/doc/gettext || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && ln /usr/include/x86_64-linux-gnu/gmp.h /usr/include/ \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gmp \ + \ + && rm -rf /usr/local/lib/php/test/gmp || true \ + && rm -rf /usr/local/lib/php/doc/gmp || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/hash || true \ + && rm -rf /usr/local/lib/php/doc/hash || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/iconv || true \ + && rm -rf /usr/local/lib/php/doc/iconv || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install igbinary \ && docker-php-ext-enable igbinary \ + \ + && rm -rf /usr/local/lib/php/test/igbinary || true \ + && rm -rf /usr/local/lib/php/doc/igbinary || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install imagick \ && docker-php-ext-enable imagick \ + \ + && rm -rf /usr/local/lib/php/test/imagick || true \ + && rm -rf /usr/local/lib/php/doc/imagick || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && ln -s /usr/lib/x86_64-linux-gnu/libkrb5* /usr/lib/ \ && /usr/local/bin/docker-php-ext-configure imap --with-kerberos --with-imap-ssl --with-imap \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) imap \ + \ + && rm -rf /usr/local/lib/php/test/imap || true \ + && rm -rf /usr/local/lib/php/doc/imap || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) interbase \ + \ + && rm -rf /usr/local/lib/php/test/interbase || true \ + && rm -rf /usr/local/lib/php/doc/interbase || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) intl \ + \ + && rm -rf /usr/local/lib/php/test/intl || true \ + && rm -rf /usr/local/lib/php/doc/intl || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/json || true \ + && rm -rf /usr/local/lib/php/doc/json || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && ln -s /usr/lib/x86_64-linux-gnu/libldap* /usr/lib/ \ && /usr/local/bin/docker-php-ext-configure ldap --with-ldap --with-ldap-sasl \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) ldap \ + \ + && rm -rf /usr/local/lib/php/test/ldap || true \ + && rm -rf /usr/local/lib/php/doc/ldap || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/libxml || true \ + && rm -rf /usr/local/lib/php/doc/libxml || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/mbstring || true \ + && rm -rf /usr/local/lib/php/doc/mbstring || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mcrypt \ + \ + && rm -rf /usr/local/lib/php/test/mcrypt || true \ + && rm -rf /usr/local/lib/php/doc/mcrypt || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install memcache \ && docker-php-ext-enable memcache \ + \ + && rm -rf /usr/local/lib/php/test/memcache || true \ + && rm -rf /usr/local/lib/php/doc/memcache || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install memcached-2.2.0 \ && docker-php-ext-enable memcached \ + \ + && rm -rf /usr/local/lib/php/test/memcached || true \ + && rm -rf /usr/local/lib/php/doc/memcached || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && yes | pecl install mongo \ && docker-php-ext-enable mongo \ + \ + && rm -rf /usr/local/lib/php/test/mongo || true \ + && rm -rf /usr/local/lib/php/doc/mongo || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install mongodb \ && docker-php-ext-enable mongodb \ + \ + && rm -rf /usr/local/lib/php/test/mongodb || true \ + && rm -rf /usr/local/lib/php/doc/mongodb || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install msgpack-0.5.7 \ && docker-php-ext-enable msgpack \ + \ + && rm -rf /usr/local/lib/php/test/msgpack || true \ + && rm -rf /usr/local/lib/php/doc/msgpack || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysql \ + \ + && rm -rf /usr/local/lib/php/test/mysql || true \ + && rm -rf /usr/local/lib/php/doc/mysql || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysqli \ + \ + && rm -rf /usr/local/lib/php/test/mysqli || true \ + && rm -rf /usr/local/lib/php/doc/mysqli || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/mysqlnd || true \ + && rm -rf /usr/local/lib/php/doc/mysqlnd || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) opcache \ + \ + && rm -rf /usr/local/lib/php/test/opcache || true \ + && rm -rf /usr/local/lib/php/doc/opcache || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/openssl || true \ + && rm -rf /usr/local/lib/php/doc/openssl || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pcntl \ + \ + && rm -rf /usr/local/lib/php/test/pcntl || true \ + && rm -rf /usr/local/lib/php/doc/pcntl || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/pcre || true \ + && rm -rf /usr/local/lib/php/doc/pcre || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/pdo || true \ + && rm -rf /usr/local/lib/php/doc/pdo || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && ln -s /usr/lib/x86_64-linux-gnu/libsybdb.* /usr/lib/ \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_dblib \ + \ + && rm -rf /usr/local/lib/php/test/pdo_dblib || true \ + && rm -rf /usr/local/lib/php/doc/pdo_dblib || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_firebird \ + \ + && rm -rf /usr/local/lib/php/test/pdo_firebird || true \ + && rm -rf /usr/local/lib/php/doc/pdo_firebird || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure pdo_mysql --with-zlib-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_mysql \ + \ + && rm -rf /usr/local/lib/php/test/pdo_mysql || true \ + && rm -rf /usr/local/lib/php/doc/pdo_mysql || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_pgsql \ + \ + && rm -rf /usr/local/lib/php/test/pdo_pgsql || true \ + && rm -rf /usr/local/lib/php/doc/pdo_pgsql || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/pdo_sqlite || true \ + && rm -rf /usr/local/lib/php/doc/pdo_sqlite || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pgsql \ + \ + && rm -rf /usr/local/lib/php/test/pgsql || true \ + && rm -rf /usr/local/lib/php/doc/pgsql || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && git clone -v https://github.com/phalcon/cphalcon /tmp/phalcon \ && cd /tmp/phalcon \ && git checkout $(git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | tail -1 | sed 's/^.*tags\///g') \ && cd build && ./install \ && docker-php-ext-enable phalcon \ + \ + && rm -rf /usr/local/lib/php/test/phalcon || true \ + && rm -rf /usr/local/lib/php/doc/phalcon || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/posix || true \ + && rm -rf /usr/local/lib/php/doc/posix || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pspell \ + \ + && rm -rf /usr/local/lib/php/test/pspell || true \ + && rm -rf /usr/local/lib/php/doc/pspell || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/readline || true \ + && rm -rf /usr/local/lib/php/doc/readline || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \ + \ + && rm -rf /usr/local/lib/php/test/recode || true \ + && rm -rf /usr/local/lib/php/doc/recode || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install redis \ && docker-php-ext-enable redis \ + \ + && rm -rf /usr/local/lib/php/test/redis || true \ + && rm -rf /usr/local/lib/php/doc/redis || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install rdkafka \ && docker-php-ext-enable rdkafka \ + \ + && rm -rf /usr/local/lib/php/test/rdkafka || true \ + && rm -rf /usr/local/lib/php/doc/rdkafka || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/session || true \ + && rm -rf /usr/local/lib/php/doc/session || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) shmop \ + \ + && rm -rf /usr/local/lib/php/test/shmop || true \ + && rm -rf /usr/local/lib/php/doc/shmop || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/simplexml || true \ + && rm -rf /usr/local/lib/php/doc/simplexml || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure snmp --with-openssl-dir \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) snmp \ + \ + && rm -rf /usr/local/lib/php/test/snmp || true \ + && rm -rf /usr/local/lib/php/doc/snmp || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure soap --with-libxml-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) soap \ + \ + && rm -rf /usr/local/lib/php/test/soap || true \ + && rm -rf /usr/local/lib/php/doc/soap || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sockets \ + \ + && rm -rf /usr/local/lib/php/test/sockets || true \ + && rm -rf /usr/local/lib/php/doc/sockets || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install swoole-1.9.23 \ && docker-php-ext-enable swoole \ + \ + && rm -rf /usr/local/lib/php/test/swoole || true \ + && rm -rf /usr/local/lib/php/doc/swoole || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvmsg \ + \ + && rm -rf /usr/local/lib/php/test/sysvmsg || true \ + && rm -rf /usr/local/lib/php/doc/sysvmsg || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvsem \ + \ + && rm -rf /usr/local/lib/php/test/sysvsem || true \ + && rm -rf /usr/local/lib/php/doc/sysvsem || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvshm \ + \ + && rm -rf /usr/local/lib/php/test/sysvshm || true \ + && rm -rf /usr/local/lib/php/doc/sysvshm || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) tidy \ + \ + && rm -rf /usr/local/lib/php/test/tidy || true \ + && rm -rf /usr/local/lib/php/doc/tidy || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/tokenizer || true \ + && rm -rf /usr/local/lib/php/doc/tokenizer || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install uploadprogress \ && docker-php-ext-enable uploadprogress \ + \ + && rm -rf /usr/local/lib/php/test/uploadprogress || true \ + && rm -rf /usr/local/lib/php/doc/uploadprogress || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure wddx --with-libxml-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) wddx \ + \ + && rm -rf /usr/local/lib/php/test/wddx || true \ + && rm -rf /usr/local/lib/php/doc/wddx || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install xdebug-2.4.1 \ && docker-php-ext-enable xdebug \ + \ + && rm -rf /usr/local/lib/php/test/xdebug || true \ + && rm -rf /usr/local/lib/php/doc/xdebug || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/xml || true \ + && rm -rf /usr/local/lib/php/doc/xml || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/xmlreader || true \ + && rm -rf /usr/local/lib/php/doc/xmlreader || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure xmlrpc --with-libxml-dir=/usr --with-iconv-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xmlrpc \ + \ + && rm -rf /usr/local/lib/php/test/xmlrpc || true \ + && rm -rf /usr/local/lib/php/doc/xmlrpc || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/xmlwriter || true \ + && rm -rf /usr/local/lib/php/doc/xmlwriter || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xsl \ + \ + && rm -rf /usr/local/lib/php/test/xsl || true \ + && rm -rf /usr/local/lib/php/doc/xsl || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure zip --with-zlib-dir=/usr --with-pcre-dir=/usr --with-libzip \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) zip \ + \ + && rm -rf /usr/local/lib/php/test/zip || true \ + && rm -rf /usr/local/lib/php/doc/zip || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && rm -rf /tmp/* \ \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false ${BUILD_DEPS} \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests ${RUN_DEPS} \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ + \ && update-ca-certificates \ - && find /usr/local/{bin,lib,sbin} -type f -print0 | xargs -0r strip --strip-all -p 2>/dev/null || true \ - && find "$(php -r 'echo ini_get("extension_dir");')" -print0 | xargs -0r strip --strip-all -p 2>/dev/null || true + \ + && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find "$(php -r 'echo ini_get("extension_dir");')" -type f -exce strip --strip-all -p '{}' 2>/dev/null || true ### diff --git a/Dockerfiles/mods/Dockerfile-7.0 b/Dockerfiles/mods/Dockerfile-7.0 index 6908daa7..e5d6f887 100644 --- a/Dockerfiles/mods/Dockerfile-7.0 +++ b/Dockerfiles/mods/Dockerfile-7.0 @@ -105,35 +105,155 @@ RUN set -x \ && rm -rf ioncube \ && rm -rf ioncube.tar.gz \ \ + \ + && rm -rf /usr/local/lib/php/test/ioncube || true \ + && rm -rf /usr/local/lib/php/doc/ioncube || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && echo "/usr" | pecl install amqp \ && docker-php-ext-enable amqp \ + \ + && rm -rf /usr/local/lib/php/test/amqp || true \ + && rm -rf /usr/local/lib/php/doc/amqp || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install apcu \ && docker-php-ext-enable apcu \ + \ + && rm -rf /usr/local/lib/php/test/apcu || true \ + && rm -rf /usr/local/lib/php/doc/apcu || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) bcmath \ + \ + && rm -rf /usr/local/lib/php/test/bcmath || true \ + && rm -rf /usr/local/lib/php/doc/bcmath || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) bz2 \ + \ + && rm -rf /usr/local/lib/php/test/bz2 || true \ + && rm -rf /usr/local/lib/php/doc/bz2 || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) calendar \ + \ + && rm -rf /usr/local/lib/php/test/calendar || true \ + && rm -rf /usr/local/lib/php/doc/calendar || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/ctype || true \ + && rm -rf /usr/local/lib/php/doc/ctype || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/curl || true \ + && rm -rf /usr/local/lib/php/doc/curl || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) dba \ + \ + && rm -rf /usr/local/lib/php/test/dba || true \ + && rm -rf /usr/local/lib/php/doc/dba || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/dom || true \ + && rm -rf /usr/local/lib/php/doc/dom || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) enchant \ + \ + && rm -rf /usr/local/lib/php/test/enchant || true \ + && rm -rf /usr/local/lib/php/doc/enchant || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) exif \ + \ + && rm -rf /usr/local/lib/php/test/exif || true \ + && rm -rf /usr/local/lib/php/doc/exif || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/fileinfo || true \ + && rm -rf /usr/local/lib/php/doc/fileinfo || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/filter || true \ + && rm -rf /usr/local/lib/php/doc/filter || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/ftp || true \ + && rm -rf /usr/local/lib/php/doc/ftp || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && ln -s /usr/lib/x86_64-linux-gnu/libXpm.* /usr/lib/ \ && /usr/local/bin/docker-php-ext-configure gd --with-gd --with-webp-dir=/usr --with-jpeg-dir=/usr --with-png-dir=/usr --with-zlib-dir=/usr --with-xpm-dir=/usr --with-freetype-dir=/usr --enable-gd-jis-conv --enable-gd-native-ttf \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gd \ + \ + && rm -rf /usr/local/lib/php/test/gd || true \ + && rm -rf /usr/local/lib/php/doc/gd || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gettext \ + \ + && rm -rf /usr/local/lib/php/test/gettext || true \ + && rm -rf /usr/local/lib/php/doc/gettext || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && ln /usr/include/x86_64-linux-gnu/gmp.h /usr/include/ \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gmp \ + \ + && rm -rf /usr/local/lib/php/test/gmp || true \ + && rm -rf /usr/local/lib/php/doc/gmp || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/hash || true \ + && rm -rf /usr/local/lib/php/doc/hash || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/iconv || true \ + && rm -rf /usr/local/lib/php/doc/iconv || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install igbinary \ && docker-php-ext-enable igbinary \ + \ + && rm -rf /usr/local/lib/php/test/igbinary || true \ + && rm -rf /usr/local/lib/php/doc/igbinary || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install imagick \ && docker-php-ext-enable imagick \ + \ + && rm -rf /usr/local/lib/php/test/imagick || true \ + && rm -rf /usr/local/lib/php/doc/imagick || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && ln -s /usr/lib/x86_64-linux-gnu/libkrb5* /usr/lib/ \ && /usr/local/bin/docker-php-ext-configure imap --with-kerberos --with-imap-ssl --with-imap \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) imap \ + \ + && rm -rf /usr/local/lib/php/test/imap || true \ + && rm -rf /usr/local/lib/php/doc/imap || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) interbase \ + \ + && rm -rf /usr/local/lib/php/test/interbase || true \ + && rm -rf /usr/local/lib/php/doc/interbase || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) intl \ + \ + && rm -rf /usr/local/lib/php/test/intl || true \ + && rm -rf /usr/local/lib/php/doc/intl || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/json || true \ + && rm -rf /usr/local/lib/php/doc/json || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && ln -s /usr/lib/x86_64-linux-gnu/libldap* /usr/lib/ \ && /usr/local/bin/docker-php-ext-configure ldap --with-ldap --with-ldap-sasl \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) ldap \ + \ + && rm -rf /usr/local/lib/php/test/ldap || true \ + && rm -rf /usr/local/lib/php/doc/ldap || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/libxml || true \ + && rm -rf /usr/local/lib/php/doc/libxml || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/mbstring || true \ + && rm -rf /usr/local/lib/php/doc/mbstring || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mcrypt \ + \ + && rm -rf /usr/local/lib/php/test/mcrypt || true \ + && rm -rf /usr/local/lib/php/doc/mcrypt || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && git clone -v https://github.com/websupport-sk/pecl-memcache /tmp/memcache \ && cd /tmp/memcache \ && phpize \ @@ -141,46 +261,190 @@ RUN set -x \ && make -j$(getconf _NPROCESSORS_ONLN) \ && make install \ && docker-php-ext-enable memcache \ + \ + && rm -rf /usr/local/lib/php/test/memcache || true \ + && rm -rf /usr/local/lib/php/doc/memcache || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install memcached \ && docker-php-ext-enable memcached \ + \ + && rm -rf /usr/local/lib/php/test/memcached || true \ + && rm -rf /usr/local/lib/php/doc/memcached || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install mongodb \ && docker-php-ext-enable mongodb \ + \ + && rm -rf /usr/local/lib/php/test/mongodb || true \ + && rm -rf /usr/local/lib/php/doc/mongodb || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install msgpack \ && docker-php-ext-enable msgpack \ + \ + && rm -rf /usr/local/lib/php/test/msgpack || true \ + && rm -rf /usr/local/lib/php/doc/msgpack || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysqli \ + \ + && rm -rf /usr/local/lib/php/test/mysqli || true \ + && rm -rf /usr/local/lib/php/doc/mysqli || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/mysqlnd || true \ + && rm -rf /usr/local/lib/php/doc/mysqlnd || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) opcache \ + \ + && rm -rf /usr/local/lib/php/test/opcache || true \ + && rm -rf /usr/local/lib/php/doc/opcache || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/openssl || true \ + && rm -rf /usr/local/lib/php/doc/openssl || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pcntl \ + \ + && rm -rf /usr/local/lib/php/test/pcntl || true \ + && rm -rf /usr/local/lib/php/doc/pcntl || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/pcre || true \ + && rm -rf /usr/local/lib/php/doc/pcre || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo \ + \ + && rm -rf /usr/local/lib/php/test/pdo || true \ + && rm -rf /usr/local/lib/php/doc/pdo || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && ln -s /usr/lib/x86_64-linux-gnu/libsybdb.* /usr/lib/ \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_dblib \ + \ + && rm -rf /usr/local/lib/php/test/pdo_dblib || true \ + && rm -rf /usr/local/lib/php/doc/pdo_dblib || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_firebird \ + \ + && rm -rf /usr/local/lib/php/test/pdo_firebird || true \ + && rm -rf /usr/local/lib/php/doc/pdo_firebird || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure pdo_mysql --with-zlib-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_mysql \ + \ + && rm -rf /usr/local/lib/php/test/pdo_mysql || true \ + && rm -rf /usr/local/lib/php/doc/pdo_mysql || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_pgsql \ + \ + && rm -rf /usr/local/lib/php/test/pdo_pgsql || true \ + && rm -rf /usr/local/lib/php/doc/pdo_pgsql || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/pdo_sqlite || true \ + && rm -rf /usr/local/lib/php/doc/pdo_sqlite || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pgsql \ + \ + && rm -rf /usr/local/lib/php/test/pgsql || true \ + && rm -rf /usr/local/lib/php/doc/pgsql || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && git clone -v https://github.com/phalcon/cphalcon /tmp/phalcon \ && cd /tmp/phalcon \ && git checkout $(git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | tail -1 | sed 's/^.*tags\///g') \ && cd build && ./install \ && docker-php-ext-enable phalcon \ + \ + && rm -rf /usr/local/lib/php/test/phalcon || true \ + && rm -rf /usr/local/lib/php/doc/phalcon || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/posix || true \ + && rm -rf /usr/local/lib/php/doc/posix || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pspell \ + \ + && rm -rf /usr/local/lib/php/test/pspell || true \ + && rm -rf /usr/local/lib/php/doc/pspell || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/readline || true \ + && rm -rf /usr/local/lib/php/doc/readline || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \ + \ + && rm -rf /usr/local/lib/php/test/recode || true \ + && rm -rf /usr/local/lib/php/doc/recode || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install redis \ && docker-php-ext-enable redis \ + \ + && rm -rf /usr/local/lib/php/test/redis || true \ + && rm -rf /usr/local/lib/php/doc/redis || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install rdkafka \ && docker-php-ext-enable rdkafka \ + \ + && rm -rf /usr/local/lib/php/test/rdkafka || true \ + && rm -rf /usr/local/lib/php/doc/rdkafka || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/session || true \ + && rm -rf /usr/local/lib/php/doc/session || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) shmop \ + \ + && rm -rf /usr/local/lib/php/test/shmop || true \ + && rm -rf /usr/local/lib/php/doc/shmop || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/simplexml || true \ + && rm -rf /usr/local/lib/php/doc/simplexml || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure snmp --with-openssl-dir \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) snmp \ + \ + && rm -rf /usr/local/lib/php/test/snmp || true \ + && rm -rf /usr/local/lib/php/doc/snmp || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure soap --with-libxml-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) soap \ + \ + && rm -rf /usr/local/lib/php/test/soap || true \ + && rm -rf /usr/local/lib/php/doc/soap || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sockets \ + \ + && rm -rf /usr/local/lib/php/test/sockets || true \ + && rm -rf /usr/local/lib/php/doc/sockets || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install swoole-2.2.0 \ && docker-php-ext-enable swoole \ + \ + && rm -rf /usr/local/lib/php/test/swoole || true \ + && rm -rf /usr/local/lib/php/doc/swoole || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvmsg \ + \ + && rm -rf /usr/local/lib/php/test/sysvmsg || true \ + && rm -rf /usr/local/lib/php/doc/sysvmsg || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvsem \ + \ + && rm -rf /usr/local/lib/php/test/sysvsem || true \ + && rm -rf /usr/local/lib/php/doc/sysvsem || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvshm \ + \ + && rm -rf /usr/local/lib/php/test/sysvshm || true \ + && rm -rf /usr/local/lib/php/doc/sysvshm || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) tidy \ + \ + && rm -rf /usr/local/lib/php/test/tidy || true \ + && rm -rf /usr/local/lib/php/doc/tidy || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/tokenizer || true \ + && rm -rf /usr/local/lib/php/doc/tokenizer || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && git clone -v https://github.com/php/pecl-php-uploadprogress /tmp/uploadprogress \ && cd /tmp/uploadprogress \ && phpize \ @@ -188,24 +452,64 @@ RUN set -x \ && make -j$(getconf _NPROCESSORS_ONLN) \ && make install \ && docker-php-ext-enable uploadprogress \ + \ + && rm -rf /usr/local/lib/php/test/uploadprogress || true \ + && rm -rf /usr/local/lib/php/doc/uploadprogress || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure wddx --with-libxml-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) wddx \ + \ + && rm -rf /usr/local/lib/php/test/wddx || true \ + && rm -rf /usr/local/lib/php/doc/wddx || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install xdebug \ && docker-php-ext-enable xdebug \ + \ + && rm -rf /usr/local/lib/php/test/xdebug || true \ + && rm -rf /usr/local/lib/php/doc/xdebug || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/xml || true \ + && rm -rf /usr/local/lib/php/doc/xml || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/xmlreader || true \ + && rm -rf /usr/local/lib/php/doc/xmlreader || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure xmlrpc --with-libxml-dir=/usr --with-iconv-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xmlrpc \ + \ + && rm -rf /usr/local/lib/php/test/xmlrpc || true \ + && rm -rf /usr/local/lib/php/doc/xmlrpc || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/xmlwriter || true \ + && rm -rf /usr/local/lib/php/doc/xmlwriter || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xsl \ + \ + && rm -rf /usr/local/lib/php/test/xsl || true \ + && rm -rf /usr/local/lib/php/doc/xsl || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure zip --with-zlib-dir=/usr --with-pcre-dir=/usr --with-libzip \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) zip \ + \ + && rm -rf /usr/local/lib/php/test/zip || true \ + && rm -rf /usr/local/lib/php/doc/zip || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && rm -rf /tmp/* \ \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false ${BUILD_DEPS} \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests ${RUN_DEPS} \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ + \ && update-ca-certificates \ - && find /usr/local/{bin,lib,sbin} -type f -print0 | xargs -0r strip --strip-all -p 2>/dev/null || true \ - && find "$(php -r 'echo ini_get("extension_dir");')" -print0 | xargs -0r strip --strip-all -p 2>/dev/null || true + \ + && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find "$(php -r 'echo ini_get("extension_dir");')" -type f -exce strip --strip-all -p '{}' 2>/dev/null || true ### diff --git a/Dockerfiles/mods/Dockerfile-7.1 b/Dockerfiles/mods/Dockerfile-7.1 index d0a59723..eee0656c 100644 --- a/Dockerfiles/mods/Dockerfile-7.1 +++ b/Dockerfiles/mods/Dockerfile-7.1 @@ -105,35 +105,155 @@ RUN set -x \ && rm -rf ioncube \ && rm -rf ioncube.tar.gz \ \ + \ + && rm -rf /usr/local/lib/php/test/ioncube || true \ + && rm -rf /usr/local/lib/php/doc/ioncube || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && echo "/usr" | pecl install amqp \ && docker-php-ext-enable amqp \ + \ + && rm -rf /usr/local/lib/php/test/amqp || true \ + && rm -rf /usr/local/lib/php/doc/amqp || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install apcu \ && docker-php-ext-enable apcu \ + \ + && rm -rf /usr/local/lib/php/test/apcu || true \ + && rm -rf /usr/local/lib/php/doc/apcu || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) bcmath \ + \ + && rm -rf /usr/local/lib/php/test/bcmath || true \ + && rm -rf /usr/local/lib/php/doc/bcmath || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) bz2 \ + \ + && rm -rf /usr/local/lib/php/test/bz2 || true \ + && rm -rf /usr/local/lib/php/doc/bz2 || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) calendar \ + \ + && rm -rf /usr/local/lib/php/test/calendar || true \ + && rm -rf /usr/local/lib/php/doc/calendar || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/ctype || true \ + && rm -rf /usr/local/lib/php/doc/ctype || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/curl || true \ + && rm -rf /usr/local/lib/php/doc/curl || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) dba \ + \ + && rm -rf /usr/local/lib/php/test/dba || true \ + && rm -rf /usr/local/lib/php/doc/dba || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/dom || true \ + && rm -rf /usr/local/lib/php/doc/dom || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) enchant \ + \ + && rm -rf /usr/local/lib/php/test/enchant || true \ + && rm -rf /usr/local/lib/php/doc/enchant || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) exif \ + \ + && rm -rf /usr/local/lib/php/test/exif || true \ + && rm -rf /usr/local/lib/php/doc/exif || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/fileinfo || true \ + && rm -rf /usr/local/lib/php/doc/fileinfo || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/filter || true \ + && rm -rf /usr/local/lib/php/doc/filter || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/ftp || true \ + && rm -rf /usr/local/lib/php/doc/ftp || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && ln -s /usr/lib/x86_64-linux-gnu/libXpm.* /usr/lib/ \ && /usr/local/bin/docker-php-ext-configure gd --with-gd --with-webp-dir=/usr --with-jpeg-dir=/usr --with-png-dir=/usr --with-zlib-dir=/usr --with-xpm-dir=/usr --with-freetype-dir=/usr --enable-gd-jis-conv --enable-gd-native-ttf \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gd \ + \ + && rm -rf /usr/local/lib/php/test/gd || true \ + && rm -rf /usr/local/lib/php/doc/gd || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gettext \ + \ + && rm -rf /usr/local/lib/php/test/gettext || true \ + && rm -rf /usr/local/lib/php/doc/gettext || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && ln /usr/include/x86_64-linux-gnu/gmp.h /usr/include/ \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gmp \ + \ + && rm -rf /usr/local/lib/php/test/gmp || true \ + && rm -rf /usr/local/lib/php/doc/gmp || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/hash || true \ + && rm -rf /usr/local/lib/php/doc/hash || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/iconv || true \ + && rm -rf /usr/local/lib/php/doc/iconv || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install igbinary \ && docker-php-ext-enable igbinary \ + \ + && rm -rf /usr/local/lib/php/test/igbinary || true \ + && rm -rf /usr/local/lib/php/doc/igbinary || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install imagick \ && docker-php-ext-enable imagick \ + \ + && rm -rf /usr/local/lib/php/test/imagick || true \ + && rm -rf /usr/local/lib/php/doc/imagick || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && ln -s /usr/lib/x86_64-linux-gnu/libkrb5* /usr/lib/ \ && /usr/local/bin/docker-php-ext-configure imap --with-kerberos --with-imap-ssl --with-imap \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) imap \ + \ + && rm -rf /usr/local/lib/php/test/imap || true \ + && rm -rf /usr/local/lib/php/doc/imap || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) interbase \ + \ + && rm -rf /usr/local/lib/php/test/interbase || true \ + && rm -rf /usr/local/lib/php/doc/interbase || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) intl \ + \ + && rm -rf /usr/local/lib/php/test/intl || true \ + && rm -rf /usr/local/lib/php/doc/intl || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/json || true \ + && rm -rf /usr/local/lib/php/doc/json || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && ln -s /usr/lib/x86_64-linux-gnu/libldap* /usr/lib/ \ && /usr/local/bin/docker-php-ext-configure ldap --with-ldap --with-ldap-sasl \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) ldap \ + \ + && rm -rf /usr/local/lib/php/test/ldap || true \ + && rm -rf /usr/local/lib/php/doc/ldap || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/libxml || true \ + && rm -rf /usr/local/lib/php/doc/libxml || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/mbstring || true \ + && rm -rf /usr/local/lib/php/doc/mbstring || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mcrypt \ + \ + && rm -rf /usr/local/lib/php/test/mcrypt || true \ + && rm -rf /usr/local/lib/php/doc/mcrypt || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && git clone -v https://github.com/websupport-sk/pecl-memcache /tmp/memcache \ && cd /tmp/memcache \ && phpize \ @@ -141,45 +261,193 @@ RUN set -x \ && make -j$(getconf _NPROCESSORS_ONLN) \ && make install \ && docker-php-ext-enable memcache \ + \ + && rm -rf /usr/local/lib/php/test/memcache || true \ + && rm -rf /usr/local/lib/php/doc/memcache || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install memcached \ && docker-php-ext-enable memcached \ + \ + && rm -rf /usr/local/lib/php/test/memcached || true \ + && rm -rf /usr/local/lib/php/doc/memcached || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install mongodb \ && docker-php-ext-enable mongodb \ + \ + && rm -rf /usr/local/lib/php/test/mongodb || true \ + && rm -rf /usr/local/lib/php/doc/mongodb || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install msgpack \ && docker-php-ext-enable msgpack \ + \ + && rm -rf /usr/local/lib/php/test/msgpack || true \ + && rm -rf /usr/local/lib/php/doc/msgpack || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysqli \ + \ + && rm -rf /usr/local/lib/php/test/mysqli || true \ + && rm -rf /usr/local/lib/php/doc/mysqli || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/mysqlnd || true \ + && rm -rf /usr/local/lib/php/doc/mysqlnd || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) opcache \ + \ + && rm -rf /usr/local/lib/php/test/opcache || true \ + && rm -rf /usr/local/lib/php/doc/opcache || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/openssl || true \ + && rm -rf /usr/local/lib/php/doc/openssl || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pcntl \ + \ + && rm -rf /usr/local/lib/php/test/pcntl || true \ + && rm -rf /usr/local/lib/php/doc/pcntl || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/pcre || true \ + && rm -rf /usr/local/lib/php/doc/pcre || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/pdo || true \ + && rm -rf /usr/local/lib/php/doc/pdo || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && ln -s /usr/lib/x86_64-linux-gnu/libsybdb.* /usr/lib/ \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_dblib \ + \ + && rm -rf /usr/local/lib/php/test/pdo_dblib || true \ + && rm -rf /usr/local/lib/php/doc/pdo_dblib || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_firebird \ + \ + && rm -rf /usr/local/lib/php/test/pdo_firebird || true \ + && rm -rf /usr/local/lib/php/doc/pdo_firebird || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure pdo_mysql --with-zlib-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_mysql \ + \ + && rm -rf /usr/local/lib/php/test/pdo_mysql || true \ + && rm -rf /usr/local/lib/php/doc/pdo_mysql || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_pgsql \ + \ + && rm -rf /usr/local/lib/php/test/pdo_pgsql || true \ + && rm -rf /usr/local/lib/php/doc/pdo_pgsql || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/pdo_sqlite || true \ + && rm -rf /usr/local/lib/php/doc/pdo_sqlite || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pgsql \ + \ + && rm -rf /usr/local/lib/php/test/pgsql || true \ + && rm -rf /usr/local/lib/php/doc/pgsql || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && git clone -v https://github.com/phalcon/cphalcon /tmp/phalcon \ && cd /tmp/phalcon \ && git checkout $(git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | tail -1 | sed 's/^.*tags\///g') \ && cd build && ./install \ && docker-php-ext-enable phalcon \ + \ + && rm -rf /usr/local/lib/php/test/phalcon || true \ + && rm -rf /usr/local/lib/php/doc/phalcon || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/phar || true \ + && rm -rf /usr/local/lib/php/doc/phar || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/posix || true \ + && rm -rf /usr/local/lib/php/doc/posix || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pspell \ + \ + && rm -rf /usr/local/lib/php/test/pspell || true \ + && rm -rf /usr/local/lib/php/doc/pspell || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/readline || true \ + && rm -rf /usr/local/lib/php/doc/readline || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \ + \ + && rm -rf /usr/local/lib/php/test/recode || true \ + && rm -rf /usr/local/lib/php/doc/recode || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install redis \ && docker-php-ext-enable redis \ + \ + && rm -rf /usr/local/lib/php/test/redis || true \ + && rm -rf /usr/local/lib/php/doc/redis || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install rdkafka \ && docker-php-ext-enable rdkafka \ + \ + && rm -rf /usr/local/lib/php/test/rdkafka || true \ + && rm -rf /usr/local/lib/php/doc/rdkafka || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/session || true \ + && rm -rf /usr/local/lib/php/doc/session || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) shmop \ + \ + && rm -rf /usr/local/lib/php/test/shmop || true \ + && rm -rf /usr/local/lib/php/doc/shmop || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/simplexml || true \ + && rm -rf /usr/local/lib/php/doc/simplexml || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure snmp --with-openssl-dir \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) snmp \ + \ + && rm -rf /usr/local/lib/php/test/snmp || true \ + && rm -rf /usr/local/lib/php/doc/snmp || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure soap --with-libxml-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) soap \ + \ + && rm -rf /usr/local/lib/php/test/soap || true \ + && rm -rf /usr/local/lib/php/doc/soap || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sockets \ + \ + && rm -rf /usr/local/lib/php/test/sockets || true \ + && rm -rf /usr/local/lib/php/doc/sockets || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install swoole \ && docker-php-ext-enable swoole \ + \ + && rm -rf /usr/local/lib/php/test/swoole || true \ + && rm -rf /usr/local/lib/php/doc/swoole || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvmsg \ + \ + && rm -rf /usr/local/lib/php/test/sysvmsg || true \ + && rm -rf /usr/local/lib/php/doc/sysvmsg || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvsem \ + \ + && rm -rf /usr/local/lib/php/test/sysvsem || true \ + && rm -rf /usr/local/lib/php/doc/sysvsem || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvshm \ + \ + && rm -rf /usr/local/lib/php/test/sysvshm || true \ + && rm -rf /usr/local/lib/php/doc/sysvshm || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) tidy \ + \ + && rm -rf /usr/local/lib/php/test/tidy || true \ + && rm -rf /usr/local/lib/php/doc/tidy || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/tokenizer || true \ + && rm -rf /usr/local/lib/php/doc/tokenizer || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && git clone -v https://github.com/php/pecl-php-uploadprogress /tmp/uploadprogress \ && cd /tmp/uploadprogress \ && phpize \ @@ -187,24 +455,64 @@ RUN set -x \ && make -j$(getconf _NPROCESSORS_ONLN) \ && make install \ && docker-php-ext-enable uploadprogress \ + \ + && rm -rf /usr/local/lib/php/test/uploadprogress || true \ + && rm -rf /usr/local/lib/php/doc/uploadprogress || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure wddx --with-libxml-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) wddx \ + \ + && rm -rf /usr/local/lib/php/test/wddx || true \ + && rm -rf /usr/local/lib/php/doc/wddx || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install xdebug \ && docker-php-ext-enable xdebug \ + \ + && rm -rf /usr/local/lib/php/test/xdebug || true \ + && rm -rf /usr/local/lib/php/doc/xdebug || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/xml || true \ + && rm -rf /usr/local/lib/php/doc/xml || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/xmlreader || true \ + && rm -rf /usr/local/lib/php/doc/xmlreader || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure xmlrpc --with-libxml-dir=/usr --with-iconv-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xmlrpc \ + \ + && rm -rf /usr/local/lib/php/test/xmlrpc || true \ + && rm -rf /usr/local/lib/php/doc/xmlrpc || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/xmlwriter || true \ + && rm -rf /usr/local/lib/php/doc/xmlwriter || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xsl \ + \ + && rm -rf /usr/local/lib/php/test/xsl || true \ + && rm -rf /usr/local/lib/php/doc/xsl || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure zip --with-zlib-dir=/usr --with-pcre-dir=/usr --with-libzip \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) zip \ + \ + && rm -rf /usr/local/lib/php/test/zip || true \ + && rm -rf /usr/local/lib/php/doc/zip || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && rm -rf /tmp/* \ \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false ${BUILD_DEPS} \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests ${RUN_DEPS} \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ + \ && update-ca-certificates \ - && find /usr/local/{bin,lib,sbin} -type f -print0 | xargs -0r strip --strip-all -p 2>/dev/null || true \ - && find "$(php -r 'echo ini_get("extension_dir");')" -print0 | xargs -0r strip --strip-all -p 2>/dev/null || true + \ + && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find "$(php -r 'echo ini_get("extension_dir");')" -type f -exce strip --strip-all -p '{}' 2>/dev/null || true ### diff --git a/Dockerfiles/mods/Dockerfile-7.2 b/Dockerfiles/mods/Dockerfile-7.2 index 5d69e49d..d630a619 100644 --- a/Dockerfiles/mods/Dockerfile-7.2 +++ b/Dockerfiles/mods/Dockerfile-7.2 @@ -105,36 +105,156 @@ RUN set -x \ && rm -rf ioncube \ && rm -rf ioncube.tar.gz \ \ + \ + && rm -rf /usr/local/lib/php/test/ioncube || true \ + && rm -rf /usr/local/lib/php/doc/ioncube || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && echo "/usr" | pecl install amqp \ && docker-php-ext-enable amqp \ + \ + && rm -rf /usr/local/lib/php/test/amqp || true \ + && rm -rf /usr/local/lib/php/doc/amqp || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install apcu \ && docker-php-ext-enable apcu \ + \ + && rm -rf /usr/local/lib/php/test/apcu || true \ + && rm -rf /usr/local/lib/php/doc/apcu || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) bcmath \ + \ + && rm -rf /usr/local/lib/php/test/bcmath || true \ + && rm -rf /usr/local/lib/php/doc/bcmath || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) bz2 \ + \ + && rm -rf /usr/local/lib/php/test/bz2 || true \ + && rm -rf /usr/local/lib/php/doc/bz2 || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) calendar \ + \ + && rm -rf /usr/local/lib/php/test/calendar || true \ + && rm -rf /usr/local/lib/php/doc/calendar || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/ctype || true \ + && rm -rf /usr/local/lib/php/doc/ctype || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/curl || true \ + && rm -rf /usr/local/lib/php/doc/curl || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) dba \ + \ + && rm -rf /usr/local/lib/php/test/dba || true \ + && rm -rf /usr/local/lib/php/doc/dba || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/dom || true \ + && rm -rf /usr/local/lib/php/doc/dom || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) enchant \ + \ + && rm -rf /usr/local/lib/php/test/enchant || true \ + && rm -rf /usr/local/lib/php/doc/enchant || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) exif \ + \ + && rm -rf /usr/local/lib/php/test/exif || true \ + && rm -rf /usr/local/lib/php/doc/exif || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/fileinfo || true \ + && rm -rf /usr/local/lib/php/doc/fileinfo || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/filter || true \ + && rm -rf /usr/local/lib/php/doc/filter || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/ftp || true \ + && rm -rf /usr/local/lib/php/doc/ftp || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && ln -s /usr/lib/x86_64-linux-gnu/libXpm.* /usr/lib/ \ && /usr/local/bin/docker-php-ext-configure gd --with-gd --with-webp-dir=/usr --with-jpeg-dir=/usr --with-png-dir=/usr --with-zlib-dir=/usr --with-xpm-dir=/usr --with-freetype-dir=/usr --enable-gd-jis-conv \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gd \ + \ + && rm -rf /usr/local/lib/php/test/gd || true \ + && rm -rf /usr/local/lib/php/doc/gd || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gettext \ + \ + && rm -rf /usr/local/lib/php/test/gettext || true \ + && rm -rf /usr/local/lib/php/doc/gettext || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && ln /usr/include/x86_64-linux-gnu/gmp.h /usr/include/ \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gmp \ + \ + && rm -rf /usr/local/lib/php/test/gmp || true \ + && rm -rf /usr/local/lib/php/doc/gmp || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/hash || true \ + && rm -rf /usr/local/lib/php/doc/hash || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/iconv || true \ + && rm -rf /usr/local/lib/php/doc/iconv || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install igbinary \ && docker-php-ext-enable igbinary \ + \ + && rm -rf /usr/local/lib/php/test/igbinary || true \ + && rm -rf /usr/local/lib/php/doc/igbinary || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install imagick \ && docker-php-ext-enable imagick \ + \ + && rm -rf /usr/local/lib/php/test/imagick || true \ + && rm -rf /usr/local/lib/php/doc/imagick || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && ln -s /usr/lib/x86_64-linux-gnu/libkrb5* /usr/lib/ \ && /usr/local/bin/docker-php-ext-configure imap --with-kerberos --with-imap-ssl --with-imap \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) imap \ + \ + && rm -rf /usr/local/lib/php/test/imap || true \ + && rm -rf /usr/local/lib/php/doc/imap || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) interbase \ + \ + && rm -rf /usr/local/lib/php/test/interbase || true \ + && rm -rf /usr/local/lib/php/doc/interbase || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) intl \ + \ + && rm -rf /usr/local/lib/php/test/intl || true \ + && rm -rf /usr/local/lib/php/doc/intl || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/json || true \ + && rm -rf /usr/local/lib/php/doc/json || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && ln -s /usr/lib/x86_64-linux-gnu/libldap* /usr/lib/ \ && /usr/local/bin/docker-php-ext-configure ldap --with-ldap --with-ldap-sasl \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) ldap \ + \ + && rm -rf /usr/local/lib/php/test/ldap || true \ + && rm -rf /usr/local/lib/php/doc/ldap || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/libxml || true \ + && rm -rf /usr/local/lib/php/doc/libxml || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/mbstring || true \ + && rm -rf /usr/local/lib/php/doc/mbstring || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install mcrypt-1.0.1 \ && docker-php-ext-enable mcrypt \ + \ + && rm -rf /usr/local/lib/php/test/mcrypt || true \ + && rm -rf /usr/local/lib/php/doc/mcrypt || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && git clone -v https://github.com/websupport-sk/pecl-memcache /tmp/memcache \ && cd /tmp/memcache \ && phpize \ @@ -142,45 +262,197 @@ RUN set -x \ && make -j$(getconf _NPROCESSORS_ONLN) \ && make install \ && docker-php-ext-enable memcache \ + \ + && rm -rf /usr/local/lib/php/test/memcache || true \ + && rm -rf /usr/local/lib/php/doc/memcache || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install memcached \ && docker-php-ext-enable memcached \ + \ + && rm -rf /usr/local/lib/php/test/memcached || true \ + && rm -rf /usr/local/lib/php/doc/memcached || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install mongodb \ && docker-php-ext-enable mongodb \ + \ + && rm -rf /usr/local/lib/php/test/mongodb || true \ + && rm -rf /usr/local/lib/php/doc/mongodb || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install msgpack \ && docker-php-ext-enable msgpack \ + \ + && rm -rf /usr/local/lib/php/test/msgpack || true \ + && rm -rf /usr/local/lib/php/doc/msgpack || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysqli \ + \ + && rm -rf /usr/local/lib/php/test/mysqli || true \ + && rm -rf /usr/local/lib/php/doc/mysqli || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/mysqlnd || true \ + && rm -rf /usr/local/lib/php/doc/mysqlnd || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) opcache \ + \ + && rm -rf /usr/local/lib/php/test/opcache || true \ + && rm -rf /usr/local/lib/php/doc/opcache || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/openssl || true \ + && rm -rf /usr/local/lib/php/doc/openssl || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pcntl \ + \ + && rm -rf /usr/local/lib/php/test/pcntl || true \ + && rm -rf /usr/local/lib/php/doc/pcntl || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/pcre || true \ + && rm -rf /usr/local/lib/php/doc/pcre || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/pdo || true \ + && rm -rf /usr/local/lib/php/doc/pdo || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && ln -s /usr/lib/x86_64-linux-gnu/libsybdb.* /usr/lib/ \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_dblib \ + \ + && rm -rf /usr/local/lib/php/test/pdo_dblib || true \ + && rm -rf /usr/local/lib/php/doc/pdo_dblib || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_firebird \ + \ + && rm -rf /usr/local/lib/php/test/pdo_firebird || true \ + && rm -rf /usr/local/lib/php/doc/pdo_firebird || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure pdo_mysql --with-zlib-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_mysql \ + \ + && rm -rf /usr/local/lib/php/test/pdo_mysql || true \ + && rm -rf /usr/local/lib/php/doc/pdo_mysql || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_pgsql \ + \ + && rm -rf /usr/local/lib/php/test/pdo_pgsql || true \ + && rm -rf /usr/local/lib/php/doc/pdo_pgsql || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/pdo_sqlite || true \ + && rm -rf /usr/local/lib/php/doc/pdo_sqlite || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pgsql \ + \ + && rm -rf /usr/local/lib/php/test/pgsql || true \ + && rm -rf /usr/local/lib/php/doc/pgsql || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && git clone -v https://github.com/phalcon/cphalcon /tmp/phalcon \ && cd /tmp/phalcon \ && git checkout $(git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | tail -1 | sed 's/^.*tags\///g') \ && cd build && ./install \ && docker-php-ext-enable phalcon \ + \ + && rm -rf /usr/local/lib/php/test/phalcon || true \ + && rm -rf /usr/local/lib/php/doc/phalcon || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/phar || true \ + && rm -rf /usr/local/lib/php/doc/phar || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/posix || true \ + && rm -rf /usr/local/lib/php/doc/posix || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pspell \ + \ + && rm -rf /usr/local/lib/php/test/pspell || true \ + && rm -rf /usr/local/lib/php/doc/pspell || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/readline || true \ + && rm -rf /usr/local/lib/php/doc/readline || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \ + \ + && rm -rf /usr/local/lib/php/test/recode || true \ + && rm -rf /usr/local/lib/php/doc/recode || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install redis \ && docker-php-ext-enable redis \ + \ + && rm -rf /usr/local/lib/php/test/redis || true \ + && rm -rf /usr/local/lib/php/doc/redis || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install rdkafka \ && docker-php-ext-enable rdkafka \ + \ + && rm -rf /usr/local/lib/php/test/rdkafka || true \ + && rm -rf /usr/local/lib/php/doc/rdkafka || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/session || true \ + && rm -rf /usr/local/lib/php/doc/session || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) shmop \ + \ + && rm -rf /usr/local/lib/php/test/shmop || true \ + && rm -rf /usr/local/lib/php/doc/shmop || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/simplexml || true \ + && rm -rf /usr/local/lib/php/doc/simplexml || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure snmp --with-openssl-dir \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) snmp \ + \ + && rm -rf /usr/local/lib/php/test/snmp || true \ + && rm -rf /usr/local/lib/php/doc/snmp || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure soap --with-libxml-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) soap \ + \ + && rm -rf /usr/local/lib/php/test/soap || true \ + && rm -rf /usr/local/lib/php/doc/soap || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sockets \ + \ + && rm -rf /usr/local/lib/php/test/sockets || true \ + && rm -rf /usr/local/lib/php/doc/sockets || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/sodium || true \ + && rm -rf /usr/local/lib/php/doc/sodium || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install swoole \ && docker-php-ext-enable swoole \ + \ + && rm -rf /usr/local/lib/php/test/swoole || true \ + && rm -rf /usr/local/lib/php/doc/swoole || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvmsg \ + \ + && rm -rf /usr/local/lib/php/test/sysvmsg || true \ + && rm -rf /usr/local/lib/php/doc/sysvmsg || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvsem \ + \ + && rm -rf /usr/local/lib/php/test/sysvsem || true \ + && rm -rf /usr/local/lib/php/doc/sysvsem || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvshm \ + \ + && rm -rf /usr/local/lib/php/test/sysvshm || true \ + && rm -rf /usr/local/lib/php/doc/sysvshm || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) tidy \ + \ + && rm -rf /usr/local/lib/php/test/tidy || true \ + && rm -rf /usr/local/lib/php/doc/tidy || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/tokenizer || true \ + && rm -rf /usr/local/lib/php/doc/tokenizer || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && git clone -v https://github.com/php/pecl-php-uploadprogress /tmp/uploadprogress \ && cd /tmp/uploadprogress \ && phpize \ @@ -188,24 +460,64 @@ RUN set -x \ && make -j$(getconf _NPROCESSORS_ONLN) \ && make install \ && docker-php-ext-enable uploadprogress \ + \ + && rm -rf /usr/local/lib/php/test/uploadprogress || true \ + && rm -rf /usr/local/lib/php/doc/uploadprogress || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure wddx --with-libxml-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) wddx \ + \ + && rm -rf /usr/local/lib/php/test/wddx || true \ + && rm -rf /usr/local/lib/php/doc/wddx || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install xdebug \ && docker-php-ext-enable xdebug \ + \ + && rm -rf /usr/local/lib/php/test/xdebug || true \ + && rm -rf /usr/local/lib/php/doc/xdebug || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/xml || true \ + && rm -rf /usr/local/lib/php/doc/xml || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/xmlreader || true \ + && rm -rf /usr/local/lib/php/doc/xmlreader || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure xmlrpc --with-libxml-dir=/usr --with-iconv-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xmlrpc \ + \ + && rm -rf /usr/local/lib/php/test/xmlrpc || true \ + && rm -rf /usr/local/lib/php/doc/xmlrpc || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/xmlwriter || true \ + && rm -rf /usr/local/lib/php/doc/xmlwriter || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xsl \ + \ + && rm -rf /usr/local/lib/php/test/xsl || true \ + && rm -rf /usr/local/lib/php/doc/xsl || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure zip --with-zlib-dir=/usr --with-pcre-dir=/usr --with-libzip \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) zip \ + \ + && rm -rf /usr/local/lib/php/test/zip || true \ + && rm -rf /usr/local/lib/php/doc/zip || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && rm -rf /tmp/* \ \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false ${BUILD_DEPS} \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests ${RUN_DEPS} \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ + \ && update-ca-certificates \ - && find /usr/local/{bin,lib,sbin} -type f -print0 | xargs -0r strip --strip-all -p 2>/dev/null || true \ - && find "$(php -r 'echo ini_get("extension_dir");')" -print0 | xargs -0r strip --strip-all -p 2>/dev/null || true + \ + && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find "$(php -r 'echo ini_get("extension_dir");')" -type f -exce strip --strip-all -p '{}' 2>/dev/null || true ### diff --git a/Dockerfiles/mods/Dockerfile-7.3 b/Dockerfiles/mods/Dockerfile-7.3 index ad82cd87..5a0dd6a4 100644 --- a/Dockerfiles/mods/Dockerfile-7.3 +++ b/Dockerfiles/mods/Dockerfile-7.3 @@ -98,61 +98,289 @@ RUN set -x \ \ && pecl install apcu \ && docker-php-ext-enable apcu \ + \ + && rm -rf /usr/local/lib/php/test/apcu || true \ + && rm -rf /usr/local/lib/php/doc/apcu || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) bcmath \ + \ + && rm -rf /usr/local/lib/php/test/bcmath || true \ + && rm -rf /usr/local/lib/php/doc/bcmath || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) bz2 \ + \ + && rm -rf /usr/local/lib/php/test/bz2 || true \ + && rm -rf /usr/local/lib/php/doc/bz2 || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) calendar \ + \ + && rm -rf /usr/local/lib/php/test/calendar || true \ + && rm -rf /usr/local/lib/php/doc/calendar || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/ctype || true \ + && rm -rf /usr/local/lib/php/doc/ctype || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/curl || true \ + && rm -rf /usr/local/lib/php/doc/curl || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) dba \ + \ + && rm -rf /usr/local/lib/php/test/dba || true \ + && rm -rf /usr/local/lib/php/doc/dba || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/dom || true \ + && rm -rf /usr/local/lib/php/doc/dom || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) enchant \ + \ + && rm -rf /usr/local/lib/php/test/enchant || true \ + && rm -rf /usr/local/lib/php/doc/enchant || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) exif \ + \ + && rm -rf /usr/local/lib/php/test/exif || true \ + && rm -rf /usr/local/lib/php/doc/exif || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/fileinfo || true \ + && rm -rf /usr/local/lib/php/doc/fileinfo || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/filter || true \ + && rm -rf /usr/local/lib/php/doc/filter || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/ftp || true \ + && rm -rf /usr/local/lib/php/doc/ftp || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && ln -s /usr/lib/x86_64-linux-gnu/libXpm.* /usr/lib/ \ && /usr/local/bin/docker-php-ext-configure gd --with-gd --with-webp-dir=/usr --with-jpeg-dir=/usr --with-png-dir=/usr --with-zlib-dir=/usr --with-xpm-dir=/usr --with-freetype-dir=/usr --enable-gd-jis-conv \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gd \ + \ + && rm -rf /usr/local/lib/php/test/gd || true \ + && rm -rf /usr/local/lib/php/doc/gd || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gettext \ + \ + && rm -rf /usr/local/lib/php/test/gettext || true \ + && rm -rf /usr/local/lib/php/doc/gettext || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && ln /usr/include/x86_64-linux-gnu/gmp.h /usr/include/ \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gmp \ + \ + && rm -rf /usr/local/lib/php/test/gmp || true \ + && rm -rf /usr/local/lib/php/doc/gmp || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/hash || true \ + && rm -rf /usr/local/lib/php/doc/hash || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/iconv || true \ + && rm -rf /usr/local/lib/php/doc/iconv || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install igbinary \ && docker-php-ext-enable igbinary \ + \ + && rm -rf /usr/local/lib/php/test/igbinary || true \ + && rm -rf /usr/local/lib/php/doc/igbinary || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install imagick \ && docker-php-ext-enable imagick \ + \ + && rm -rf /usr/local/lib/php/test/imagick || true \ + && rm -rf /usr/local/lib/php/doc/imagick || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && ln -s /usr/lib/x86_64-linux-gnu/libkrb5* /usr/lib/ \ && /usr/local/bin/docker-php-ext-configure imap --with-kerberos --with-imap-ssl --with-imap \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) imap \ + \ + && rm -rf /usr/local/lib/php/test/imap || true \ + && rm -rf /usr/local/lib/php/doc/imap || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) interbase \ + \ + && rm -rf /usr/local/lib/php/test/interbase || true \ + && rm -rf /usr/local/lib/php/doc/interbase || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) intl \ + \ + && rm -rf /usr/local/lib/php/test/intl || true \ + && rm -rf /usr/local/lib/php/doc/intl || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/json || true \ + && rm -rf /usr/local/lib/php/doc/json || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && ln -s /usr/lib/x86_64-linux-gnu/libldap* /usr/lib/ \ && /usr/local/bin/docker-php-ext-configure ldap --with-ldap --with-ldap-sasl \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) ldap \ + \ + && rm -rf /usr/local/lib/php/test/ldap || true \ + && rm -rf /usr/local/lib/php/doc/ldap || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/libxml || true \ + && rm -rf /usr/local/lib/php/doc/libxml || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/mbstring || true \ + && rm -rf /usr/local/lib/php/doc/mbstring || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install mcrypt-1.0.1 \ && docker-php-ext-enable mcrypt \ + \ + && rm -rf /usr/local/lib/php/test/mcrypt || true \ + && rm -rf /usr/local/lib/php/doc/mcrypt || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && git clone -v https://github.com/php-memcached-dev/php-memcached /tmp/memcached \ && cd /tmp/memcached \ && git checkout master \ && phpize && ./configure --enable-memcached && make -j$(getconf _NPROCESSORS_ONLN) && make install \ && docker-php-ext-enable memcached \ + \ + && rm -rf /usr/local/lib/php/test/memcached || true \ + && rm -rf /usr/local/lib/php/doc/memcached || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install mongodb \ && docker-php-ext-enable mongodb \ + \ + && rm -rf /usr/local/lib/php/test/mongodb || true \ + && rm -rf /usr/local/lib/php/doc/mongodb || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysqli \ + \ + && rm -rf /usr/local/lib/php/test/mysqli || true \ + && rm -rf /usr/local/lib/php/doc/mysqli || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/mysqlnd || true \ + && rm -rf /usr/local/lib/php/doc/mysqlnd || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) opcache \ + \ + && rm -rf /usr/local/lib/php/test/opcache || true \ + && rm -rf /usr/local/lib/php/doc/opcache || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/openssl || true \ + && rm -rf /usr/local/lib/php/doc/openssl || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pcntl \ + \ + && rm -rf /usr/local/lib/php/test/pcntl || true \ + && rm -rf /usr/local/lib/php/doc/pcntl || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/pcre || true \ + && rm -rf /usr/local/lib/php/doc/pcre || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/pdo || true \ + && rm -rf /usr/local/lib/php/doc/pdo || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && ln -s /usr/lib/x86_64-linux-gnu/libsybdb.* /usr/lib/ \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_dblib \ + \ + && rm -rf /usr/local/lib/php/test/pdo_dblib || true \ + && rm -rf /usr/local/lib/php/doc/pdo_dblib || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_firebird \ + \ + && rm -rf /usr/local/lib/php/test/pdo_firebird || true \ + && rm -rf /usr/local/lib/php/doc/pdo_firebird || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure pdo_mysql --with-zlib-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_mysql \ + \ + && rm -rf /usr/local/lib/php/test/pdo_mysql || true \ + && rm -rf /usr/local/lib/php/doc/pdo_mysql || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_pgsql \ + \ + && rm -rf /usr/local/lib/php/test/pdo_pgsql || true \ + && rm -rf /usr/local/lib/php/doc/pdo_pgsql || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/pdo_sqlite || true \ + && rm -rf /usr/local/lib/php/doc/pdo_sqlite || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pgsql \ + \ + && rm -rf /usr/local/lib/php/test/pgsql || true \ + && rm -rf /usr/local/lib/php/doc/pgsql || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/phar || true \ + && rm -rf /usr/local/lib/php/doc/phar || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/posix || true \ + && rm -rf /usr/local/lib/php/doc/posix || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pspell \ + \ + && rm -rf /usr/local/lib/php/test/pspell || true \ + && rm -rf /usr/local/lib/php/doc/pspell || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/readline || true \ + && rm -rf /usr/local/lib/php/doc/readline || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \ + \ + && rm -rf /usr/local/lib/php/test/recode || true \ + && rm -rf /usr/local/lib/php/doc/recode || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install redis \ && docker-php-ext-enable redis \ + \ + && rm -rf /usr/local/lib/php/test/redis || true \ + && rm -rf /usr/local/lib/php/doc/redis || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && pecl install rdkafka \ && docker-php-ext-enable rdkafka \ + \ + && rm -rf /usr/local/lib/php/test/rdkafka || true \ + && rm -rf /usr/local/lib/php/doc/rdkafka || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/session || true \ + && rm -rf /usr/local/lib/php/doc/session || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) shmop \ + \ + && rm -rf /usr/local/lib/php/test/shmop || true \ + && rm -rf /usr/local/lib/php/doc/shmop || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/simplexml || true \ + && rm -rf /usr/local/lib/php/doc/simplexml || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure snmp --with-openssl-dir \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) snmp \ + \ + && rm -rf /usr/local/lib/php/test/snmp || true \ + && rm -rf /usr/local/lib/php/doc/snmp || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure soap --with-libxml-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) soap \ + \ + && rm -rf /usr/local/lib/php/test/soap || true \ + && rm -rf /usr/local/lib/php/doc/soap || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sockets \ + \ + && rm -rf /usr/local/lib/php/test/sockets || true \ + && rm -rf /usr/local/lib/php/doc/sockets || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/sodium || true \ + && rm -rf /usr/local/lib/php/doc/sodium || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && git clone -v https://github.com/swoole/swoole-src /tmp/swoole \ && cd /tmp/swoole \ && git checkout master \ @@ -191,10 +419,34 @@ RUN set -x \ && make install \ \ && docker-php-ext-enable swoole \ + \ + && rm -rf /usr/local/lib/php/test/swoole || true \ + && rm -rf /usr/local/lib/php/doc/swoole || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvmsg \ + \ + && rm -rf /usr/local/lib/php/test/sysvmsg || true \ + && rm -rf /usr/local/lib/php/doc/sysvmsg || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvsem \ + \ + && rm -rf /usr/local/lib/php/test/sysvsem || true \ + && rm -rf /usr/local/lib/php/doc/sysvsem || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvshm \ + \ + && rm -rf /usr/local/lib/php/test/sysvshm || true \ + && rm -rf /usr/local/lib/php/doc/sysvshm || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) tidy \ + \ + && rm -rf /usr/local/lib/php/test/tidy || true \ + && rm -rf /usr/local/lib/php/doc/tidy || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/tokenizer || true \ + && rm -rf /usr/local/lib/php/doc/tokenizer || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && git clone -v https://github.com/php/pecl-php-uploadprogress /tmp/uploadprogress \ && cd /tmp/uploadprogress \ && phpize \ @@ -202,22 +454,58 @@ RUN set -x \ && make -j$(getconf _NPROCESSORS_ONLN) \ && make install \ && docker-php-ext-enable uploadprogress \ + \ + && rm -rf /usr/local/lib/php/test/uploadprogress || true \ + && rm -rf /usr/local/lib/php/doc/uploadprogress || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure wddx --with-libxml-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) wddx \ + \ + && rm -rf /usr/local/lib/php/test/wddx || true \ + && rm -rf /usr/local/lib/php/doc/wddx || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/xml || true \ + && rm -rf /usr/local/lib/php/doc/xml || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/xmlreader || true \ + && rm -rf /usr/local/lib/php/doc/xmlreader || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure xmlrpc --with-libxml-dir=/usr --with-iconv-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xmlrpc \ + \ + && rm -rf /usr/local/lib/php/test/xmlrpc || true \ + && rm -rf /usr/local/lib/php/doc/xmlrpc || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ + \ + && rm -rf /usr/local/lib/php/test/xmlwriter || true \ + && rm -rf /usr/local/lib/php/doc/xmlwriter || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xsl \ + \ + && rm -rf /usr/local/lib/php/test/xsl || true \ + && rm -rf /usr/local/lib/php/doc/xsl || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && /usr/local/bin/docker-php-ext-configure zip --with-zlib-dir=/usr --with-pcre-dir=/usr --with-libzip \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) zip \ + \ + && rm -rf /usr/local/lib/php/test/zip || true \ + && rm -rf /usr/local/lib/php/doc/zip || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ && rm -rf /tmp/* \ \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false ${BUILD_DEPS} \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests ${RUN_DEPS} \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ + \ && update-ca-certificates \ - && find /usr/local/{bin,lib,sbin} -type f -print0 | xargs -0r strip --strip-all -p 2>/dev/null || true \ - && find "$(php -r 'echo ini_get("extension_dir");')" -print0 | xargs -0r strip --strip-all -p 2>/dev/null || true + \ + && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find "$(php -r 'echo ini_get("extension_dir");')" -type f -exce strip --strip-all -p '{}' 2>/dev/null || true ### diff --git a/Dockerfiles/prod/Dockerfile-5.2 b/Dockerfiles/prod/Dockerfile-5.2 index 475c6c7f..7825b3c7 100644 --- a/Dockerfiles/prod/Dockerfile-5.2 +++ b/Dockerfiles/prod/Dockerfile-5.2 @@ -32,7 +32,11 @@ RUN set -x \ \ && rm -rf /etc/supervisor* \ && mkdir -p /etc/supervisor/conf.d \ - && mkdir -p /var/log/supervisor + && mkdir -p /var/log/supervisor \ + \ + && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true diff --git a/Dockerfiles/prod/Dockerfile-5.3 b/Dockerfiles/prod/Dockerfile-5.3 index d25929ad..654776f9 100644 --- a/Dockerfiles/prod/Dockerfile-5.3 +++ b/Dockerfiles/prod/Dockerfile-5.3 @@ -32,7 +32,11 @@ RUN set -x \ \ && rm -rf /etc/supervisor* \ && mkdir -p /etc/supervisor/conf.d \ - && mkdir -p /var/log/supervisor + && mkdir -p /var/log/supervisor \ + \ + && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true diff --git a/Dockerfiles/prod/Dockerfile-5.4 b/Dockerfiles/prod/Dockerfile-5.4 index 3444f793..1889bb11 100644 --- a/Dockerfiles/prod/Dockerfile-5.4 +++ b/Dockerfiles/prod/Dockerfile-5.4 @@ -32,7 +32,11 @@ RUN set -x \ \ && rm -rf /etc/supervisor* \ && mkdir -p /etc/supervisor/conf.d \ - && mkdir -p /var/log/supervisor + && mkdir -p /var/log/supervisor \ + \ + && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true diff --git a/Dockerfiles/prod/Dockerfile-5.5 b/Dockerfiles/prod/Dockerfile-5.5 index 2a1c3349..a68c45e0 100644 --- a/Dockerfiles/prod/Dockerfile-5.5 +++ b/Dockerfiles/prod/Dockerfile-5.5 @@ -32,7 +32,11 @@ RUN set -x \ \ && rm -rf /etc/supervisor* \ && mkdir -p /etc/supervisor/conf.d \ - && mkdir -p /var/log/supervisor + && mkdir -p /var/log/supervisor \ + \ + && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true diff --git a/Dockerfiles/prod/Dockerfile-5.6 b/Dockerfiles/prod/Dockerfile-5.6 index 65856788..0a2216d1 100644 --- a/Dockerfiles/prod/Dockerfile-5.6 +++ b/Dockerfiles/prod/Dockerfile-5.6 @@ -32,7 +32,11 @@ RUN set -x \ \ && rm -rf /etc/supervisor* \ && mkdir -p /etc/supervisor/conf.d \ - && mkdir -p /var/log/supervisor + && mkdir -p /var/log/supervisor \ + \ + && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true diff --git a/Dockerfiles/prod/Dockerfile-7.0 b/Dockerfiles/prod/Dockerfile-7.0 index fb129fc9..6819783f 100644 --- a/Dockerfiles/prod/Dockerfile-7.0 +++ b/Dockerfiles/prod/Dockerfile-7.0 @@ -32,7 +32,11 @@ RUN set -x \ \ && rm -rf /etc/supervisor* \ && mkdir -p /etc/supervisor/conf.d \ - && mkdir -p /var/log/supervisor + && mkdir -p /var/log/supervisor \ + \ + && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true diff --git a/Dockerfiles/prod/Dockerfile-7.1 b/Dockerfiles/prod/Dockerfile-7.1 index cfd73f38..57c196e0 100644 --- a/Dockerfiles/prod/Dockerfile-7.1 +++ b/Dockerfiles/prod/Dockerfile-7.1 @@ -32,7 +32,11 @@ RUN set -x \ \ && rm -rf /etc/supervisor* \ && mkdir -p /etc/supervisor/conf.d \ - && mkdir -p /var/log/supervisor + && mkdir -p /var/log/supervisor \ + \ + && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true diff --git a/Dockerfiles/prod/Dockerfile-7.2 b/Dockerfiles/prod/Dockerfile-7.2 index 927b4de8..bce2f790 100644 --- a/Dockerfiles/prod/Dockerfile-7.2 +++ b/Dockerfiles/prod/Dockerfile-7.2 @@ -32,7 +32,11 @@ RUN set -x \ \ && rm -rf /etc/supervisor* \ && mkdir -p /etc/supervisor/conf.d \ - && mkdir -p /var/log/supervisor + && mkdir -p /var/log/supervisor \ + \ + && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true diff --git a/Dockerfiles/prod/Dockerfile-7.3 b/Dockerfiles/prod/Dockerfile-7.3 index a3600352..15040bec 100644 --- a/Dockerfiles/prod/Dockerfile-7.3 +++ b/Dockerfiles/prod/Dockerfile-7.3 @@ -32,7 +32,11 @@ RUN set -x \ \ && rm -rf /etc/supervisor* \ && mkdir -p /etc/supervisor/conf.d \ - && mkdir -p /var/log/supervisor + && mkdir -p /var/log/supervisor \ + \ + && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2 index 2509199e..d97a1af2 100644 --- a/Dockerfiles/work/Dockerfile-5.2 +++ b/Dockerfiles/work/Dockerfile-5.2 @@ -104,7 +104,10 @@ RUN set -x \ yarn \ zsh \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ - && rm -rf /var/lib/apt/lists/* + && rm -rf /var/lib/apt/lists/* \ + && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true RUN set -x \ @@ -193,9 +196,13 @@ RUN set -x \ # webpack && npm install -g webpack webpack-cli \ # yamllint - && apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev python-setuptools libyaml-dev \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ +&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests libpython-dev python-setuptools libyaml-dev \ + \ && pip install --no-cache-dir yamllint \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev python-setuptools libyaml-dev && rm -rf /var/lib/apt/lists/* \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false libpython-dev python-setuptools libyaml-dev \ +&& rm -rf /var/lib/apt/lists/* \ + \ # cleanup && rm -rf /home/${MY_USER}/.*json \ && rm -rf /home/${MY_USER}/.cache \ @@ -217,7 +224,9 @@ RUN set -x \ \ && rm -rf /tmp/* \ \ - && true + && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true ### diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3 index 760716fb..4698f27a 100644 --- a/Dockerfiles/work/Dockerfile-5.3 +++ b/Dockerfiles/work/Dockerfile-5.3 @@ -104,7 +104,10 @@ RUN set -x \ yarn \ zsh \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ - && rm -rf /var/lib/apt/lists/* + && rm -rf /var/lib/apt/lists/* \ + && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true RUN set -x \ @@ -230,9 +233,13 @@ RUN set -x \ && curl https://github.com/wp-cli/wp-cli/releases/download/v1.5.1/wp-cli-1.5.1.phar -L -o /usr/local/bin/wp \ && chmod +x /usr/local/bin/wp \ # yamllint - && apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev python-setuptools libyaml-dev \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ +&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests libpython-dev python-setuptools libyaml-dev \ + \ && pip install --no-cache-dir yamllint \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev python-setuptools libyaml-dev && rm -rf /var/lib/apt/lists/* \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false libpython-dev python-setuptools libyaml-dev \ +&& rm -rf /var/lib/apt/lists/* \ + \ # cleanup && rm -rf /home/${MY_USER}/.*json \ && rm -rf /home/${MY_USER}/.cache \ @@ -254,7 +261,9 @@ RUN set -x \ \ && rm -rf /tmp/* \ \ - && true + && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true ### diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index 2c45fb3a..27efe3a2 100644 --- a/Dockerfiles/work/Dockerfile-5.4 +++ b/Dockerfiles/work/Dockerfile-5.4 @@ -104,7 +104,10 @@ RUN set -x \ yarn \ zsh \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ - && rm -rf /var/lib/apt/lists/* + && rm -rf /var/lib/apt/lists/* \ + && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true RUN set -x \ @@ -259,9 +262,13 @@ RUN set -x \ && curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \ && chmod +x /usr/local/bin/wp \ # yamllint - && apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev python-setuptools libyaml-dev \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ +&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests libpython-dev python-setuptools libyaml-dev \ + \ && pip install --no-cache-dir yamllint \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev python-setuptools libyaml-dev && rm -rf /var/lib/apt/lists/* \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false libpython-dev python-setuptools libyaml-dev \ +&& rm -rf /var/lib/apt/lists/* \ + \ # cleanup && rm -rf /home/${MY_USER}/.*json \ && rm -rf /home/${MY_USER}/.cache \ @@ -283,7 +290,9 @@ RUN set -x \ \ && rm -rf /tmp/* \ \ - && true + && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true ### diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index fc2cdd48..90cbbc77 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -104,7 +104,10 @@ RUN set -x \ yarn \ zsh \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ - && rm -rf /var/lib/apt/lists/* + && rm -rf /var/lib/apt/lists/* \ + && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true RUN set -x \ @@ -270,9 +273,13 @@ RUN set -x \ && curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \ && chmod +x /usr/local/bin/wp \ # yamllint - && apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev python-setuptools libyaml-dev \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ +&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests libpython-dev python-setuptools libyaml-dev \ + \ && pip install --no-cache-dir yamllint \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev python-setuptools libyaml-dev && rm -rf /var/lib/apt/lists/* \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false libpython-dev python-setuptools libyaml-dev \ +&& rm -rf /var/lib/apt/lists/* \ + \ # cleanup && rm -rf /home/${MY_USER}/.*json \ && rm -rf /home/${MY_USER}/.cache \ @@ -294,7 +301,9 @@ RUN set -x \ \ && rm -rf /tmp/* \ \ - && true + && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true ### diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index e8951722..5fbcfc1d 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -104,7 +104,10 @@ RUN set -x \ yarn \ zsh \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ - && rm -rf /var/lib/apt/lists/* + && rm -rf /var/lib/apt/lists/* \ + && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true RUN set -x \ @@ -283,9 +286,13 @@ RUN set -x \ && curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \ && chmod +x /usr/local/bin/wp \ # yamllint - && apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev python-setuptools libyaml-dev \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ +&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests libpython-dev python-setuptools libyaml-dev \ + \ && pip install --no-cache-dir yamllint \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev python-setuptools libyaml-dev && rm -rf /var/lib/apt/lists/* \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false libpython-dev python-setuptools libyaml-dev \ +&& rm -rf /var/lib/apt/lists/* \ + \ # cleanup && rm -rf /home/${MY_USER}/.*json \ && rm -rf /home/${MY_USER}/.cache \ @@ -307,7 +314,9 @@ RUN set -x \ \ && rm -rf /tmp/* \ \ - && true + && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true ### diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index 87ad4381..c2c4acfd 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -104,7 +104,10 @@ RUN set -x \ yarn \ zsh \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ - && rm -rf /var/lib/apt/lists/* + && rm -rf /var/lib/apt/lists/* \ + && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true RUN set -x \ @@ -283,9 +286,13 @@ RUN set -x \ && curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \ && chmod +x /usr/local/bin/wp \ # yamllint - && apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev python-setuptools libyaml-dev \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ +&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests libpython-dev python-setuptools libyaml-dev \ + \ && pip install --no-cache-dir yamllint \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev python-setuptools libyaml-dev && rm -rf /var/lib/apt/lists/* \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false libpython-dev python-setuptools libyaml-dev \ +&& rm -rf /var/lib/apt/lists/* \ + \ # cleanup && rm -rf /home/${MY_USER}/.*json \ && rm -rf /home/${MY_USER}/.cache \ @@ -307,7 +314,9 @@ RUN set -x \ \ && rm -rf /tmp/* \ \ - && true + && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true ### diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index 98cf32e4..e16409bf 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -104,7 +104,10 @@ RUN set -x \ yarn \ zsh \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ - && rm -rf /var/lib/apt/lists/* + && rm -rf /var/lib/apt/lists/* \ + && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true RUN set -x \ @@ -283,9 +286,13 @@ RUN set -x \ && curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \ && chmod +x /usr/local/bin/wp \ # yamllint - && apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev python-setuptools libyaml-dev \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ +&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests libpython-dev python-setuptools libyaml-dev \ + \ && pip install --no-cache-dir yamllint \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev python-setuptools libyaml-dev && rm -rf /var/lib/apt/lists/* \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false libpython-dev python-setuptools libyaml-dev \ +&& rm -rf /var/lib/apt/lists/* \ + \ # cleanup && rm -rf /home/${MY_USER}/.*json \ && rm -rf /home/${MY_USER}/.cache \ @@ -307,7 +314,9 @@ RUN set -x \ \ && rm -rf /tmp/* \ \ - && true + && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true ### diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index 9d30f7a8..73ae5755 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -104,7 +104,10 @@ RUN set -x \ yarn \ zsh \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ - && rm -rf /var/lib/apt/lists/* + && rm -rf /var/lib/apt/lists/* \ + && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true RUN set -x \ @@ -283,9 +286,13 @@ RUN set -x \ && curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \ && chmod +x /usr/local/bin/wp \ # yamllint - && apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev python-setuptools libyaml-dev \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ +&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests libpython-dev python-setuptools libyaml-dev \ + \ && pip install --no-cache-dir yamllint \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev python-setuptools libyaml-dev && rm -rf /var/lib/apt/lists/* \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false libpython-dev python-setuptools libyaml-dev \ +&& rm -rf /var/lib/apt/lists/* \ + \ # cleanup && rm -rf /home/${MY_USER}/.*json \ && rm -rf /home/${MY_USER}/.cache \ @@ -307,7 +314,9 @@ RUN set -x \ \ && rm -rf /tmp/* \ \ - && true + && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true ### diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index 0cf693ce..9b9b9d59 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -104,7 +104,10 @@ RUN set -x \ yarn \ zsh \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ - && rm -rf /var/lib/apt/lists/* + && rm -rf /var/lib/apt/lists/* \ + && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true RUN set -x \ @@ -272,9 +275,13 @@ RUN set -x \ && curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \ && chmod +x /usr/local/bin/wp \ # yamllint - && apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev python-setuptools libyaml-dev \ + && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ +&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests libpython-dev python-setuptools libyaml-dev \ + \ && pip install --no-cache-dir yamllint \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev python-setuptools libyaml-dev && rm -rf /var/lib/apt/lists/* \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false libpython-dev python-setuptools libyaml-dev \ +&& rm -rf /var/lib/apt/lists/* \ + \ # cleanup && rm -rf /home/${MY_USER}/.*json \ && rm -rf /home/${MY_USER}/.cache \ @@ -296,7 +303,9 @@ RUN set -x \ \ && rm -rf /tmp/* \ \ - && true + && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true ### diff --git a/build/ansible/DOCKERFILES/Dockerfile-mods.j2 b/build/ansible/DOCKERFILES/Dockerfile-mods.j2 index 52971353..a95ff4c4 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-mods.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-mods.j2 @@ -175,6 +175,10 @@ RUN set -x \ {% elif 'all' in extensions_available[ext] and 'load_ext' in extensions_available[ext]['all'] %} && if [ ! -f "/usr/local/etc/php/conf.d/docker-php-ext-{{ ext }}.ini" ]; then echo "extenstion={{ extensions_available[ext]['all']['load_ext'] }}" > "/usr/local/etc/php/conf.d/docker-php-ext-{{ ext }}.ini"; fi \ {% endif %} + \ + && rm -rf /usr/local/lib/php/test/{{ ext }} || true \ + && rm -rf /usr/local/lib/php/doc/{{ ext }} || true \ + && chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \ {% endif %} {% endfor %} && rm -rf /tmp/* \ @@ -183,9 +187,13 @@ RUN set -x \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests ${RUN_DEPS} \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ + \ && update-ca-certificates \ - && find /usr/local/{bin,lib,sbin} -type f -print0 | xargs -0r strip --strip-all -p 2>/dev/null || true \ - && find "$(php -r 'echo ini_get("extension_dir");')" -print0 | xargs -0r strip --strip-all -p 2>/dev/null || true + \ + && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find "$(php -r 'echo ini_get("extension_dir");')" -type f -exce strip --strip-all -p '{}' 2>/dev/null || true {% if debug %} diff --git a/build/ansible/DOCKERFILES/Dockerfile-prod.j2 b/build/ansible/DOCKERFILES/Dockerfile-prod.j2 index 572cb0ba..8934ebd4 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-prod.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-prod.j2 @@ -32,7 +32,11 @@ RUN set -x \ \ && rm -rf /etc/supervisor* \ && mkdir -p /etc/supervisor/conf.d \ - && mkdir -p /var/log/supervisor + && mkdir -p /var/log/supervisor \ + \ + && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true diff --git a/build/ansible/DOCKERFILES/Dockerfile-work.j2 b/build/ansible/DOCKERFILES/Dockerfile-work.j2 index 5dfd3f73..cbbed7a8 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-work.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-work.j2 @@ -125,7 +125,10 @@ RUN set -x \ yarn \ zsh \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ - && rm -rf /var/lib/apt/lists/* + && rm -rf /var/lib/apt/lists/* \ + && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true RUN set -x \ @@ -156,7 +159,9 @@ RUN set -x \ {% endif %} {% endif %} {% endfor %} - && true + && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ + && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true ### diff --git a/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml index 1a62ddfe..a8286369 100644 --- a/build/ansible/group_vars/all.yml +++ b/build/ansible/group_vars/all.yml @@ -610,9 +610,13 @@ software_available: yamllint: check: yamllint --version 2>&1 | grep -E '[.0-9]+' all: - pre: apt update && apt install --no-install-recommends --no-install-suggests -y libpython-dev python-setuptools libyaml-dev + pre: | + DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests libpython-dev python-setuptools libyaml-dev \ command: pip install --no-cache-dir yamllint - post: apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps libpython-dev python-setuptools libyaml-dev && rm -rf /var/lib/apt/lists/* + post: | + DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false libpython-dev python-setuptools libyaml-dev \ + && rm -rf /var/lib/apt/lists/* \ cleanup: all: command: | From 61224dfb12a69e8358440c6c5a71fea1f71fa9db Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 1 Nov 2018 15:07:53 +0100 Subject: [PATCH 6/6] Use newer pip version --- Dockerfiles/mods/Dockerfile-5.2 | 8 +++--- Dockerfiles/mods/Dockerfile-5.3 | 8 +++--- Dockerfiles/mods/Dockerfile-5.4 | 8 +++--- Dockerfiles/mods/Dockerfile-5.5 | 8 +++--- Dockerfiles/mods/Dockerfile-5.6 | 8 +++--- Dockerfiles/mods/Dockerfile-7.0 | 8 +++--- Dockerfiles/mods/Dockerfile-7.1 | 8 +++--- Dockerfiles/mods/Dockerfile-7.2 | 8 +++--- Dockerfiles/mods/Dockerfile-7.3 | 8 +++--- Dockerfiles/prod/Dockerfile-5.2 | 6 ++--- Dockerfiles/prod/Dockerfile-5.3 | 6 ++--- Dockerfiles/prod/Dockerfile-5.4 | 6 ++--- Dockerfiles/prod/Dockerfile-5.5 | 6 ++--- Dockerfiles/prod/Dockerfile-5.6 | 6 ++--- Dockerfiles/prod/Dockerfile-7.0 | 6 ++--- Dockerfiles/prod/Dockerfile-7.1 | 6 ++--- Dockerfiles/prod/Dockerfile-7.2 | 6 ++--- Dockerfiles/prod/Dockerfile-7.3 | 6 ++--- Dockerfiles/work/Dockerfile-5.2 | 27 +++++++++++++------- Dockerfiles/work/Dockerfile-5.3 | 27 +++++++++++++------- Dockerfiles/work/Dockerfile-5.4 | 27 +++++++++++++------- Dockerfiles/work/Dockerfile-5.5 | 27 +++++++++++++------- Dockerfiles/work/Dockerfile-5.6 | 27 +++++++++++++------- Dockerfiles/work/Dockerfile-7.0 | 27 +++++++++++++------- Dockerfiles/work/Dockerfile-7.1 | 27 +++++++++++++------- Dockerfiles/work/Dockerfile-7.2 | 27 +++++++++++++------- Dockerfiles/work/Dockerfile-7.3 | 27 +++++++++++++------- build/ansible/DOCKERFILES/Dockerfile-mods.j2 | 8 +++--- build/ansible/DOCKERFILES/Dockerfile-prod.j2 | 6 ++--- build/ansible/DOCKERFILES/Dockerfile-work.j2 | 21 ++++++++++----- build/ansible/group_vars/all.yml | 6 ++--- 31 files changed, 250 insertions(+), 160 deletions(-) diff --git a/Dockerfiles/mods/Dockerfile-5.2 b/Dockerfiles/mods/Dockerfile-5.2 index 65bcd1dd..55467f25 100644 --- a/Dockerfiles/mods/Dockerfile-5.2 +++ b/Dockerfiles/mods/Dockerfile-5.2 @@ -460,10 +460,10 @@ ln -s /usr/include/freetype2/freetype.h /usr/include/freetype2/freetype/freetype \ && update-ca-certificates \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find "$(php -r 'echo ini_get("extension_dir");')" -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find "$(php -r 'echo ini_get("extension_dir");')" -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true ### diff --git a/Dockerfiles/mods/Dockerfile-5.3 b/Dockerfiles/mods/Dockerfile-5.3 index 76be5d59..8ce39271 100644 --- a/Dockerfiles/mods/Dockerfile-5.3 +++ b/Dockerfiles/mods/Dockerfile-5.3 @@ -504,10 +504,10 @@ RUN set -x \ \ && update-ca-certificates \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find "$(php -r 'echo ini_get("extension_dir");')" -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find "$(php -r 'echo ini_get("extension_dir");')" -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true ### diff --git a/Dockerfiles/mods/Dockerfile-5.4 b/Dockerfiles/mods/Dockerfile-5.4 index 73c89179..ecf69ec2 100644 --- a/Dockerfiles/mods/Dockerfile-5.4 +++ b/Dockerfiles/mods/Dockerfile-5.4 @@ -509,10 +509,10 @@ RUN set -x \ \ && update-ca-certificates \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find "$(php -r 'echo ini_get("extension_dir");')" -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find "$(php -r 'echo ini_get("extension_dir");')" -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true ### diff --git a/Dockerfiles/mods/Dockerfile-5.5 b/Dockerfiles/mods/Dockerfile-5.5 index cce83ec2..51d7b9b3 100644 --- a/Dockerfiles/mods/Dockerfile-5.5 +++ b/Dockerfiles/mods/Dockerfile-5.5 @@ -507,10 +507,10 @@ RUN set -x \ \ && update-ca-certificates \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find "$(php -r 'echo ini_get("extension_dir");')" -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find "$(php -r 'echo ini_get("extension_dir");')" -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true ### diff --git a/Dockerfiles/mods/Dockerfile-5.6 b/Dockerfiles/mods/Dockerfile-5.6 index 0db79e5e..0e6aeb7d 100644 --- a/Dockerfiles/mods/Dockerfile-5.6 +++ b/Dockerfiles/mods/Dockerfile-5.6 @@ -507,10 +507,10 @@ RUN set -x \ \ && update-ca-certificates \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find "$(php -r 'echo ini_get("extension_dir");')" -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find "$(php -r 'echo ini_get("extension_dir");')" -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true ### diff --git a/Dockerfiles/mods/Dockerfile-7.0 b/Dockerfiles/mods/Dockerfile-7.0 index e5d6f887..34d102c4 100644 --- a/Dockerfiles/mods/Dockerfile-7.0 +++ b/Dockerfiles/mods/Dockerfile-7.0 @@ -506,10 +506,10 @@ RUN set -x \ \ && update-ca-certificates \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find "$(php -r 'echo ini_get("extension_dir");')" -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find "$(php -r 'echo ini_get("extension_dir");')" -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true ### diff --git a/Dockerfiles/mods/Dockerfile-7.1 b/Dockerfiles/mods/Dockerfile-7.1 index eee0656c..3d703290 100644 --- a/Dockerfiles/mods/Dockerfile-7.1 +++ b/Dockerfiles/mods/Dockerfile-7.1 @@ -509,10 +509,10 @@ RUN set -x \ \ && update-ca-certificates \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find "$(php -r 'echo ini_get("extension_dir");')" -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find "$(php -r 'echo ini_get("extension_dir");')" -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true ### diff --git a/Dockerfiles/mods/Dockerfile-7.2 b/Dockerfiles/mods/Dockerfile-7.2 index d630a619..edc6d905 100644 --- a/Dockerfiles/mods/Dockerfile-7.2 +++ b/Dockerfiles/mods/Dockerfile-7.2 @@ -514,10 +514,10 @@ RUN set -x \ \ && update-ca-certificates \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find "$(php -r 'echo ini_get("extension_dir");')" -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find "$(php -r 'echo ini_get("extension_dir");')" -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true ### diff --git a/Dockerfiles/mods/Dockerfile-7.3 b/Dockerfiles/mods/Dockerfile-7.3 index 5a0dd6a4..ae93e5d4 100644 --- a/Dockerfiles/mods/Dockerfile-7.3 +++ b/Dockerfiles/mods/Dockerfile-7.3 @@ -502,10 +502,10 @@ RUN set -x \ \ && update-ca-certificates \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find "$(php -r 'echo ini_get("extension_dir");')" -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find "$(php -r 'echo ini_get("extension_dir");')" -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true ### diff --git a/Dockerfiles/prod/Dockerfile-5.2 b/Dockerfiles/prod/Dockerfile-5.2 index 7825b3c7..5e3a012d 100644 --- a/Dockerfiles/prod/Dockerfile-5.2 +++ b/Dockerfiles/prod/Dockerfile-5.2 @@ -34,9 +34,9 @@ RUN set -x \ && mkdir -p /etc/supervisor/conf.d \ && mkdir -p /var/log/supervisor \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true diff --git a/Dockerfiles/prod/Dockerfile-5.3 b/Dockerfiles/prod/Dockerfile-5.3 index 654776f9..7c8b4eaf 100644 --- a/Dockerfiles/prod/Dockerfile-5.3 +++ b/Dockerfiles/prod/Dockerfile-5.3 @@ -34,9 +34,9 @@ RUN set -x \ && mkdir -p /etc/supervisor/conf.d \ && mkdir -p /var/log/supervisor \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true diff --git a/Dockerfiles/prod/Dockerfile-5.4 b/Dockerfiles/prod/Dockerfile-5.4 index 1889bb11..8e3aae65 100644 --- a/Dockerfiles/prod/Dockerfile-5.4 +++ b/Dockerfiles/prod/Dockerfile-5.4 @@ -34,9 +34,9 @@ RUN set -x \ && mkdir -p /etc/supervisor/conf.d \ && mkdir -p /var/log/supervisor \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true diff --git a/Dockerfiles/prod/Dockerfile-5.5 b/Dockerfiles/prod/Dockerfile-5.5 index a68c45e0..b20abb44 100644 --- a/Dockerfiles/prod/Dockerfile-5.5 +++ b/Dockerfiles/prod/Dockerfile-5.5 @@ -34,9 +34,9 @@ RUN set -x \ && mkdir -p /etc/supervisor/conf.d \ && mkdir -p /var/log/supervisor \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true diff --git a/Dockerfiles/prod/Dockerfile-5.6 b/Dockerfiles/prod/Dockerfile-5.6 index 0a2216d1..848e7214 100644 --- a/Dockerfiles/prod/Dockerfile-5.6 +++ b/Dockerfiles/prod/Dockerfile-5.6 @@ -34,9 +34,9 @@ RUN set -x \ && mkdir -p /etc/supervisor/conf.d \ && mkdir -p /var/log/supervisor \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true diff --git a/Dockerfiles/prod/Dockerfile-7.0 b/Dockerfiles/prod/Dockerfile-7.0 index 6819783f..03af05a7 100644 --- a/Dockerfiles/prod/Dockerfile-7.0 +++ b/Dockerfiles/prod/Dockerfile-7.0 @@ -34,9 +34,9 @@ RUN set -x \ && mkdir -p /etc/supervisor/conf.d \ && mkdir -p /var/log/supervisor \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true diff --git a/Dockerfiles/prod/Dockerfile-7.1 b/Dockerfiles/prod/Dockerfile-7.1 index 57c196e0..70b56617 100644 --- a/Dockerfiles/prod/Dockerfile-7.1 +++ b/Dockerfiles/prod/Dockerfile-7.1 @@ -34,9 +34,9 @@ RUN set -x \ && mkdir -p /etc/supervisor/conf.d \ && mkdir -p /var/log/supervisor \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true diff --git a/Dockerfiles/prod/Dockerfile-7.2 b/Dockerfiles/prod/Dockerfile-7.2 index bce2f790..1a38dc65 100644 --- a/Dockerfiles/prod/Dockerfile-7.2 +++ b/Dockerfiles/prod/Dockerfile-7.2 @@ -34,9 +34,9 @@ RUN set -x \ && mkdir -p /etc/supervisor/conf.d \ && mkdir -p /var/log/supervisor \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true diff --git a/Dockerfiles/prod/Dockerfile-7.3 b/Dockerfiles/prod/Dockerfile-7.3 index 15040bec..14daca81 100644 --- a/Dockerfiles/prod/Dockerfile-7.3 +++ b/Dockerfiles/prod/Dockerfile-7.3 @@ -34,9 +34,9 @@ RUN set -x \ && mkdir -p /etc/supervisor/conf.d \ && mkdir -p /var/log/supervisor \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2 index d97a1af2..961d6e6d 100644 --- a/Dockerfiles/work/Dockerfile-5.2 +++ b/Dockerfiles/work/Dockerfile-5.2 @@ -105,15 +105,21 @@ RUN set -x \ zsh \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + \ +# Get newer pip version + && pip install --upgrade pip \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false python-pip \ + && rm -rf /var/lib/apt/lists/* \ + \ + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true RUN set -x \ # ansible - && pip install --no-cache-dir --upgrade setuptools \ -&& pip install --no-cache-dir ansible \ + && /usr/local/bin/pip install --no-cache-dir --upgrade setuptools \ +&& /usr/local/bin/pip install --no-cache-dir ansible \ \ # awesomeci && git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \ @@ -199,7 +205,7 @@ RUN set -x \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests libpython-dev python-setuptools libyaml-dev \ \ - && pip install --no-cache-dir yamllint \ + && /usr/local/bin/pip install --no-cache-dir yamllint \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false libpython-dev python-setuptools libyaml-dev \ && rm -rf /var/lib/apt/lists/* \ \ @@ -224,9 +230,12 @@ RUN set -x \ \ && rm -rf /tmp/* \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + \ + && rm -rf /usr/local/src/composer/cache/* || true \ + \ + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true ### diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3 index 4698f27a..508e4d2e 100644 --- a/Dockerfiles/work/Dockerfile-5.3 +++ b/Dockerfiles/work/Dockerfile-5.3 @@ -105,17 +105,23 @@ RUN set -x \ zsh \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + \ +# Get newer pip version + && pip install --upgrade pip \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false python-pip \ + && rm -rf /var/lib/apt/lists/* \ + \ + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true RUN set -x \ # composer && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ # ansible - && pip install --no-cache-dir --upgrade setuptools \ -&& pip install --no-cache-dir ansible \ + && /usr/local/bin/pip install --no-cache-dir --upgrade setuptools \ +&& /usr/local/bin/pip install --no-cache-dir ansible \ \ # awesomeci && git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \ @@ -236,7 +242,7 @@ RUN set -x \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests libpython-dev python-setuptools libyaml-dev \ \ - && pip install --no-cache-dir yamllint \ + && /usr/local/bin/pip install --no-cache-dir yamllint \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false libpython-dev python-setuptools libyaml-dev \ && rm -rf /var/lib/apt/lists/* \ \ @@ -261,9 +267,12 @@ RUN set -x \ \ && rm -rf /tmp/* \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + \ + && rm -rf /usr/local/src/composer/cache/* || true \ + \ + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true ### diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index 27efe3a2..13c59150 100644 --- a/Dockerfiles/work/Dockerfile-5.4 +++ b/Dockerfiles/work/Dockerfile-5.4 @@ -105,17 +105,23 @@ RUN set -x \ zsh \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + \ +# Get newer pip version + && pip install --upgrade pip \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false python-pip \ + && rm -rf /var/lib/apt/lists/* \ + \ + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true RUN set -x \ # composer && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ # ansible - && pip install --no-cache-dir --upgrade setuptools \ -&& pip install --no-cache-dir ansible \ + && /usr/local/bin/pip install --no-cache-dir --upgrade setuptools \ +&& /usr/local/bin/pip install --no-cache-dir ansible \ \ # awesomeci && git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \ @@ -265,7 +271,7 @@ RUN set -x \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests libpython-dev python-setuptools libyaml-dev \ \ - && pip install --no-cache-dir yamllint \ + && /usr/local/bin/pip install --no-cache-dir yamllint \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false libpython-dev python-setuptools libyaml-dev \ && rm -rf /var/lib/apt/lists/* \ \ @@ -290,9 +296,12 @@ RUN set -x \ \ && rm -rf /tmp/* \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + \ + && rm -rf /usr/local/src/composer/cache/* || true \ + \ + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true ### diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index 90cbbc77..606b3df9 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -105,17 +105,23 @@ RUN set -x \ zsh \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + \ +# Get newer pip version + && pip install --upgrade pip \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false python-pip \ + && rm -rf /var/lib/apt/lists/* \ + \ + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true RUN set -x \ # composer && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ # ansible - && pip install --no-cache-dir --upgrade setuptools \ -&& pip install --no-cache-dir ansible \ + && /usr/local/bin/pip install --no-cache-dir --upgrade setuptools \ +&& /usr/local/bin/pip install --no-cache-dir ansible \ \ # asgardcms && COMPOSER_HOME="/usr/local/src/composer" composer global require asgardcms/asgardcms-installer \ @@ -276,7 +282,7 @@ RUN set -x \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests libpython-dev python-setuptools libyaml-dev \ \ - && pip install --no-cache-dir yamllint \ + && /usr/local/bin/pip install --no-cache-dir yamllint \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false libpython-dev python-setuptools libyaml-dev \ && rm -rf /var/lib/apt/lists/* \ \ @@ -301,9 +307,12 @@ RUN set -x \ \ && rm -rf /tmp/* \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + \ + && rm -rf /usr/local/src/composer/cache/* || true \ + \ + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true ### diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index 5fbcfc1d..c105fd61 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -105,17 +105,23 @@ RUN set -x \ zsh \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + \ +# Get newer pip version + && pip install --upgrade pip \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false python-pip \ + && rm -rf /var/lib/apt/lists/* \ + \ + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true RUN set -x \ # composer && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ # ansible - && pip install --no-cache-dir --upgrade setuptools \ -&& pip install --no-cache-dir ansible \ + && /usr/local/bin/pip install --no-cache-dir --upgrade setuptools \ +&& /usr/local/bin/pip install --no-cache-dir ansible \ \ # asgardcms && COMPOSER_HOME="/usr/local/src/composer" composer global require asgardcms/asgardcms-installer \ @@ -289,7 +295,7 @@ RUN set -x \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests libpython-dev python-setuptools libyaml-dev \ \ - && pip install --no-cache-dir yamllint \ + && /usr/local/bin/pip install --no-cache-dir yamllint \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false libpython-dev python-setuptools libyaml-dev \ && rm -rf /var/lib/apt/lists/* \ \ @@ -314,9 +320,12 @@ RUN set -x \ \ && rm -rf /tmp/* \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + \ + && rm -rf /usr/local/src/composer/cache/* || true \ + \ + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true ### diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index c2c4acfd..c876a841 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -105,17 +105,23 @@ RUN set -x \ zsh \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + \ +# Get newer pip version + && pip install --upgrade pip \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false python-pip \ + && rm -rf /var/lib/apt/lists/* \ + \ + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true RUN set -x \ # composer && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ # ansible - && pip install --no-cache-dir --upgrade setuptools \ -&& pip install --no-cache-dir ansible \ + && /usr/local/bin/pip install --no-cache-dir --upgrade setuptools \ +&& /usr/local/bin/pip install --no-cache-dir ansible \ \ # asgardcms && COMPOSER_HOME="/usr/local/src/composer" composer global require asgardcms/asgardcms-installer \ @@ -289,7 +295,7 @@ RUN set -x \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests libpython-dev python-setuptools libyaml-dev \ \ - && pip install --no-cache-dir yamllint \ + && /usr/local/bin/pip install --no-cache-dir yamllint \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false libpython-dev python-setuptools libyaml-dev \ && rm -rf /var/lib/apt/lists/* \ \ @@ -314,9 +320,12 @@ RUN set -x \ \ && rm -rf /tmp/* \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + \ + && rm -rf /usr/local/src/composer/cache/* || true \ + \ + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true ### diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index e16409bf..341930e6 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -105,17 +105,23 @@ RUN set -x \ zsh \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + \ +# Get newer pip version + && pip install --upgrade pip \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false python-pip \ + && rm -rf /var/lib/apt/lists/* \ + \ + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true RUN set -x \ # composer && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ # ansible - && pip install --no-cache-dir --upgrade setuptools \ -&& pip install --no-cache-dir ansible \ + && /usr/local/bin/pip install --no-cache-dir --upgrade setuptools \ +&& /usr/local/bin/pip install --no-cache-dir ansible \ \ # asgardcms && COMPOSER_HOME="/usr/local/src/composer" composer global require asgardcms/asgardcms-installer \ @@ -289,7 +295,7 @@ RUN set -x \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests libpython-dev python-setuptools libyaml-dev \ \ - && pip install --no-cache-dir yamllint \ + && /usr/local/bin/pip install --no-cache-dir yamllint \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false libpython-dev python-setuptools libyaml-dev \ && rm -rf /var/lib/apt/lists/* \ \ @@ -314,9 +320,12 @@ RUN set -x \ \ && rm -rf /tmp/* \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + \ + && rm -rf /usr/local/src/composer/cache/* || true \ + \ + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true ### diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index 73ae5755..c057d9d6 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -105,17 +105,23 @@ RUN set -x \ zsh \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + \ +# Get newer pip version + && pip install --upgrade pip \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false python-pip \ + && rm -rf /var/lib/apt/lists/* \ + \ + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true RUN set -x \ # composer && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ # ansible - && pip install --no-cache-dir --upgrade setuptools \ -&& pip install --no-cache-dir ansible \ + && /usr/local/bin/pip install --no-cache-dir --upgrade setuptools \ +&& /usr/local/bin/pip install --no-cache-dir ansible \ \ # asgardcms && COMPOSER_HOME="/usr/local/src/composer" composer global require asgardcms/asgardcms-installer \ @@ -289,7 +295,7 @@ RUN set -x \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests libpython-dev python-setuptools libyaml-dev \ \ - && pip install --no-cache-dir yamllint \ + && /usr/local/bin/pip install --no-cache-dir yamllint \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false libpython-dev python-setuptools libyaml-dev \ && rm -rf /var/lib/apt/lists/* \ \ @@ -314,9 +320,12 @@ RUN set -x \ \ && rm -rf /tmp/* \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + \ + && rm -rf /usr/local/src/composer/cache/* || true \ + \ + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true ### diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index 9b9b9d59..23ca571e 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -105,17 +105,23 @@ RUN set -x \ zsh \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + \ +# Get newer pip version + && pip install --upgrade pip \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false python-pip \ + && rm -rf /var/lib/apt/lists/* \ + \ + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true RUN set -x \ # composer && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ # ansible - && pip install --no-cache-dir --upgrade setuptools \ -&& pip install --no-cache-dir ansible \ + && /usr/local/bin/pip install --no-cache-dir --upgrade setuptools \ +&& /usr/local/bin/pip install --no-cache-dir ansible \ \ # asgardcms && COMPOSER_HOME="/usr/local/src/composer" composer global require asgardcms/asgardcms-installer \ @@ -278,7 +284,7 @@ RUN set -x \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests libpython-dev python-setuptools libyaml-dev \ \ - && pip install --no-cache-dir yamllint \ + && /usr/local/bin/pip install --no-cache-dir yamllint \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false libpython-dev python-setuptools libyaml-dev \ && rm -rf /var/lib/apt/lists/* \ \ @@ -303,9 +309,12 @@ RUN set -x \ \ && rm -rf /tmp/* \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + \ + && rm -rf /usr/local/src/composer/cache/* || true \ + \ + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true ### diff --git a/build/ansible/DOCKERFILES/Dockerfile-mods.j2 b/build/ansible/DOCKERFILES/Dockerfile-mods.j2 index a95ff4c4..dff6f52a 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-mods.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-mods.j2 @@ -190,10 +190,10 @@ RUN set -x \ \ && update-ca-certificates \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find "$(php -r 'echo ini_get("extension_dir");')" -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find "$(php -r 'echo ini_get("extension_dir");')" -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true {% if debug %} diff --git a/build/ansible/DOCKERFILES/Dockerfile-prod.j2 b/build/ansible/DOCKERFILES/Dockerfile-prod.j2 index 8934ebd4..de0d5d50 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-prod.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-prod.j2 @@ -34,9 +34,9 @@ RUN set -x \ && mkdir -p /etc/supervisor/conf.d \ && mkdir -p /var/log/supervisor \ \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true diff --git a/build/ansible/DOCKERFILES/Dockerfile-work.j2 b/build/ansible/DOCKERFILES/Dockerfile-work.j2 index cbbed7a8..ac28c2d9 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-work.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-work.j2 @@ -126,9 +126,15 @@ RUN set -x \ zsh \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + \ +# Get newer pip version + && pip install --upgrade pip \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false python-pip \ + && rm -rf /var/lib/apt/lists/* \ + \ + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true RUN set -x \ @@ -159,9 +165,12 @@ RUN set -x \ {% endif %} {% endif %} {% endfor %} - && find /usr/local/bin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/lib -type f -exce strip --strip-all -p '{}' 2>/dev/null || true \ - && find /usr/local/sbin -type f -exce strip --strip-all -p '{}' 2>/dev/null || true + \ + && rm -rf /usr/local/src/composer/cache/* || true \ + \ + && find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true \ + && find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true ### diff --git a/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml index a8286369..551a22ca 100644 --- a/build/ansible/group_vars/all.yml +++ b/build/ansible/group_vars/all.yml @@ -303,8 +303,8 @@ software_available: check: ansible --version | grep -E '^ansible [.0-9]+$' all: command: | - pip install --no-cache-dir --upgrade setuptools \ - && pip install --no-cache-dir ansible \ + /usr/local/bin/pip install --no-cache-dir --upgrade setuptools \ + && /usr/local/bin/pip install --no-cache-dir ansible \ awesomeci: check: | mdl --version | grep -E '[.0-9]+' \ @@ -613,7 +613,7 @@ software_available: pre: | DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests libpython-dev python-setuptools libyaml-dev \ - command: pip install --no-cache-dir yamllint + command: /usr/local/bin/pip install --no-cache-dir yamllint post: | DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false libpython-dev python-setuptools libyaml-dev \ && rm -rf /var/lib/apt/lists/* \