From dc2daccaaa7dec4e99644f0e5b52ea4d0e66f63e Mon Sep 17 00:00:00 2001 From: cytopia Date: Wed, 31 Oct 2018 23:12:46 +0100 Subject: [PATCH] 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 | 152 +++++------- Dockerfiles/mods/Dockerfile-5.3 | 155 +++++-------- Dockerfiles/mods/Dockerfile-5.4 | 156 +++++-------- Dockerfiles/mods/Dockerfile-5.5 | 160 +++++-------- Dockerfiles/mods/Dockerfile-5.6 | 172 ++++++-------- Dockerfiles/mods/Dockerfile-7.0 | 170 ++++++-------- Dockerfiles/mods/Dockerfile-7.1 | 175 ++++++-------- Dockerfiles/mods/Dockerfile-7.2 | 177 ++++++-------- Dockerfiles/mods/Dockerfile-7.3 | 189 +++++++-------- 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, 1259 insertions(+), 1194 deletions(-) diff --git a/Dockerfiles/base/Dockerfile-5.2 b/Dockerfiles/base/Dockerfile-5.2 index 55e6e59..c86f181 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 ff1a990..e68979a 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 5058095..66cc86a 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 79efd6e..12a52be 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 ef08f80..6dd7569 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 9d37c2b..e659a66 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 4e354e5..131247a 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 a5aa1b6..934fc03 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 9d2f474..a502e2e 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 37b7573..986a354 100644 --- a/Dockerfiles/mods/Dockerfile-5.2 +++ b/Dockerfiles/mods/Dockerfile-5.2 @@ -18,85 +18,61 @@ LABEL \ ### Envs ### ENV BUILD_DEPS \ - librabbitmq-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 \ - libfbclient2 \ - libib-util \ firebird-dev \ - libicu-dev \ - libldap2-dev \ - libsasl2-dev \ - libmcrypt-dev \ - zlib1g-dev \ - zlib1g-dev \ - libmemcached-dev \ - libssl-dev \ - libsasl2-dev \ freetds-dev \ + libbz2-dev \ + libc-client-dev \ + libcurl4-openssl-dev \ + libenchant-dev \ libfbclient2 \ + libfreetype6-dev \ libib-util \ - firebird-dev \ - zlib1g-dev \ + libicu-dev \ + libjpeg-dev \ + libkrb5-dev \ + libldap2-dev \ + libmagic-dev \ + libmcrypt-dev \ + libmemcached-dev \ + libpng-dev \ libpq-dev \ - libsqlite3-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 \ + libpng12-0 \ libpq5 \ - 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 4de0b52..62d9bf2 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 \ - libpq-dev \ - libssl-dev \ - libpspell-dev \ - librecode-dev \ - librdkafka-dev \ - libmm-dev \ - libxml2-dev \ - libssl-dev \ - libsnmp-dev \ - snmp \ - libxml2-dev \ libnghttp2-dev \ + libpng-dev \ + libpq-dev \ + libpspell-dev \ + librabbitmq-dev \ + librdkafka-dev \ + libsasl2-dev \ + libsnmp-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 \ - libpq5 \ - libaspell15 \ - librecode0 \ - librdkafka1 \ - snmp \ libnghttp2-5 \ + libpng12-0 \ + libpq5 \ + librabbitmq1 \ + librdkafka1 \ + 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 bc0f7c7..7caf12f 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 \ - libpq-dev \ - libssl-dev \ - libpspell-dev \ - librecode-dev \ - librdkafka-dev \ - libmm-dev \ - libxml2-dev \ - libssl-dev \ - libsnmp-dev \ - snmp \ - libxml2-dev \ libnghttp2-dev \ + libpng-dev \ + libpq-dev \ + libpspell-dev \ + librabbitmq-dev \ + librdkafka-dev \ + libsasl2-dev \ + libsnmp-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 \ - libpq5 \ - libaspell15 \ - librecode0 \ - librdkafka1 \ - snmp \ libnghttp2-5 \ + libpng12-0 \ + libpq5 \ + librabbitmq1 \ + librdkafka1 \ + 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 5405f08..8b35935 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 \ - libpq-dev \ - libssl-dev \ - libpspell-dev \ - libedit-dev \ - libreadline-dev \ - librecode-dev \ - librdkafka-dev \ - libmm-dev \ - libxml2-dev \ - libssl-dev \ - libsnmp-dev \ - snmp \ - libxml2-dev \ libnghttp2-dev \ + libpng-dev \ + libpq-dev \ + libpspell-dev \ + librabbitmq-dev \ + librdkafka-dev \ + librecode-dev \ + libsasl2-dev \ + libsnmp-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 \ - libpq5 \ - libaspell15 \ - librecode0 \ - librdkafka1 \ - snmp \ libnghttp2-5 \ + libpng12-0 \ + libpq5 \ + librabbitmq1 \ + librdkafka1 \ + 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 188017a..dedb587 100644 --- a/Dockerfiles/mods/Dockerfile-5.6 +++ b/Dockerfiles/mods/Dockerfile-5.6 @@ -18,99 +18,71 @@ LABEL \ ### Envs ### ENV BUILD_DEPS \ - librabbitmq-dev \ - libbz2-dev \ - libcurl4-openssl-dev \ - libxml2-dev \ - libenchant-dev \ - libssl-dev \ - libpng-dev \ - libjpeg-dev \ - libxpm-dev \ - libvpx-dev \ - zlib1g-dev \ - libfreetype6-dev \ - libwebp-dev \ - libgmp-dev \ - libmagickwand-dev \ - libc-client-dev \ - libkrb5-dev \ - libcurl4-openssl-dev \ - libfbclient2 \ - libib-util \ firebird-dev \ - libicu-dev \ - libldap2-dev \ - libsasl2-dev \ - libmcrypt-dev \ - zlib1g-dev \ - zlib1g-dev \ - libmemcached-dev \ - libssl-dev \ - libsasl2-dev \ - libssl-dev \ - libsasl2-dev \ freetds-dev \ + libbz2-dev \ + libc-client-dev \ + libcurl4-openssl-dev \ + libenchant-dev \ libfbclient2 \ + libfreetype6-dev \ + libgmp-dev \ libib-util \ - firebird-dev \ - zlib1g-dev \ - libpq-dev \ - libsqlite3-dev \ + libicu-dev \ + libjpeg-dev \ + libkrb5-dev \ + libldap2-dev \ + libmagickwand-dev \ + libmcrypt-dev \ + libmemcached-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 \ - libpq5 \ - libaspell15 \ - librecode0 \ - librdkafka1 \ - snmp \ libnghttp2-14 \ + libpng16-16 \ + libpq5 \ + librabbitmq4 \ + librdkafka1 \ + 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 f4001b5..4f4c6d6 100644 --- a/Dockerfiles/mods/Dockerfile-7.0 +++ b/Dockerfiles/mods/Dockerfile-7.0 @@ -18,96 +18,70 @@ LABEL \ ### Envs ### ENV BUILD_DEPS \ - librabbitmq-dev \ - libbz2-dev \ - libcurl4-openssl-dev \ - libxml2-dev \ - libenchant-dev \ - libssl-dev \ - libpng-dev \ - libjpeg-dev \ - libxpm-dev \ - libvpx-dev \ - zlib1g-dev \ - libfreetype6-dev \ - libwebp-dev \ - libgmp-dev \ - libmagickwand-dev \ - libc-client-dev \ - libkrb5-dev \ - libcurl4-openssl-dev \ - libfbclient2 \ - libib-util \ firebird-dev \ - libicu-dev \ - bison \ - libldap2-dev \ - libsasl2-dev \ - libmcrypt-dev \ - zlib1g-dev \ - zlib1g-dev \ - libmemcached-dev \ - libssl-dev \ - libsasl2-dev \ freetds-dev \ + libbz2-dev \ + libc-client-dev \ + libcurl4-openssl-dev \ + libenchant-dev \ libfbclient2 \ + libfreetype6-dev \ + libgmp-dev \ libib-util \ - firebird-dev \ - zlib1g-dev \ - libpq-dev \ - libsqlite3-dev \ + libicu-dev \ + libjpeg-dev \ + libkrb5-dev \ + libldap2-dev \ + libmagickwand-dev \ + libmcrypt-dev \ + libmemcached-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 \ - libpq5 \ - libaspell15 \ - librecode0 \ - librdkafka1 \ - snmp \ libnghttp2-14 \ + libpng16-16 \ + libpq5 \ + librabbitmq4 \ + librdkafka1 \ + 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 460b01d..39f2668 100644 --- a/Dockerfiles/mods/Dockerfile-7.1 +++ b/Dockerfiles/mods/Dockerfile-7.1 @@ -18,96 +18,70 @@ LABEL \ ### Envs ### ENV BUILD_DEPS \ - librabbitmq-dev \ - libbz2-dev \ - libcurl4-openssl-dev \ - libxml2-dev \ - libenchant-dev \ - libssl-dev \ - libpng-dev \ - libjpeg-dev \ - libxpm-dev \ - libvpx-dev \ - zlib1g-dev \ - libfreetype6-dev \ - libwebp-dev \ - libgmp-dev \ - libmagickwand-dev \ - libc-client-dev \ - libkrb5-dev \ - libcurl4-openssl-dev \ - libfbclient2 \ - libib-util \ firebird-dev \ - libicu-dev \ - libldap2-dev \ - libsasl2-dev \ - libmcrypt-dev \ - zlib1g-dev \ - zlib1g-dev \ - libmemcached-dev \ - libssl-dev \ - libsasl2-dev \ freetds-dev \ + libbz2-dev \ + libc-client-dev \ + libcurl4-openssl-dev \ + libenchant-dev \ libfbclient2 \ + libfreetype6-dev \ + libgmp-dev \ libib-util \ - firebird-dev \ - zlib1g-dev \ - libpq-dev \ - libsqlite3-dev \ - libpq-dev \ - libssl-dev \ - libpspell-dev \ - libedit-dev \ - libreadline-dev \ - librecode-dev \ - librdkafka-dev \ - libmm-dev \ - libxml2-dev \ - libssl-dev \ - libsnmp-dev \ - snmp \ - libxml2-dev \ + libicu-dev \ + libjpeg-dev \ + libkrb5-dev \ + libldap2-dev \ + libmagickwand-dev \ + libmcrypt-dev \ + libmemcached-dev \ libnghttp2-dev \ + libpng-dev \ + libpq-dev \ + libpspell-dev \ + librabbitmq-dev \ + librdkafka-dev \ + librecode-dev \ + libsasl2-dev \ + libsnmp-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 \ - libpq5 \ - libaspell15 \ - librecode0 \ - librdkafka1 \ - snmp \ libnghttp2-14 \ + libpng16-16 \ + libpq5 \ + librabbitmq4 \ + librdkafka1 \ + 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 2ad019d..275c869 100644 --- a/Dockerfiles/mods/Dockerfile-7.2 +++ b/Dockerfiles/mods/Dockerfile-7.2 @@ -18,97 +18,70 @@ LABEL \ ### Envs ### ENV BUILD_DEPS \ - librabbitmq-dev \ - libbz2-dev \ - libcurl4-openssl-dev \ - libxml2-dev \ - libenchant-dev \ - libssl-dev \ - libpng-dev \ - libjpeg-dev \ - libxpm-dev \ - libvpx-dev \ - zlib1g-dev \ - libfreetype6-dev \ - libwebp-dev \ - libgmp-dev \ - libmagickwand-dev \ - libc-client-dev \ - libkrb5-dev \ - libcurl4-openssl-dev \ - libfbclient2 \ - libib-util \ firebird-dev \ - libicu-dev \ - libldap2-dev \ - libsasl2-dev \ - libmcrypt-dev \ - zlib1g-dev \ - zlib1g-dev \ - libmemcached-dev \ - libssl-dev \ - libsasl2-dev \ freetds-dev \ + libbz2-dev \ + libc-client-dev \ + libcurl4-openssl-dev \ + libenchant-dev \ libfbclient2 \ + libfreetype6-dev \ + libgmp-dev \ libib-util \ - firebird-dev \ - zlib1g-dev \ - libpq-dev \ - libsqlite3-dev \ - libpq-dev \ - libssl-dev \ - libpspell-dev \ - libedit-dev \ - libreadline-dev \ - librecode-dev \ - librdkafka-dev \ - libmm-dev \ - libxml2-dev \ - libssl-dev \ - libsnmp-dev \ - snmp \ - libxml2-dev \ - libsodium-dev \ + libicu-dev \ + libjpeg-dev \ + libkrb5-dev \ + libldap2-dev \ + libmagickwand-dev \ + libmcrypt-dev \ + libmemcached-dev \ libnghttp2-dev \ + libpng-dev \ + libpq-dev \ + libpspell-dev \ + librabbitmq-dev \ + librdkafka-dev \ + librecode-dev \ + libsasl2-dev \ + libsnmp-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 \ - libpq5 \ - libaspell15 \ - librecode0 \ - librdkafka1 \ - snmp \ libnghttp2-14 \ + libpng16-16 \ + libpq5 \ + librabbitmq4 \ + librdkafka1 \ + 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 5bbb0e0..9f12c55 100644 --- a/Dockerfiles/mods/Dockerfile-7.3 +++ b/Dockerfiles/mods/Dockerfile-7.3 @@ -18,97 +18,71 @@ LABEL \ ### Envs ### ENV BUILD_DEPS \ - libbz2-dev \ - libcurl4-openssl-dev \ - libxml2-dev \ - libenchant-dev \ - libssl-dev \ - libpng-dev \ - libjpeg-dev \ - libxpm-dev \ - libvpx-dev \ - zlib1g-dev \ - libfreetype6-dev \ - libwebp-dev \ - libgmp-dev \ - libmagickwand-dev \ - libc-client-dev \ - libkrb5-dev \ - libcurl4-openssl-dev \ - libfbclient2 \ - libib-util \ - firebird-dev \ - libicu-dev \ - libldap2-dev \ - libsasl2-dev \ - libmcrypt-dev \ - zlib1g-dev \ - libmemcached-dev \ - libssl-dev \ - libsasl2-dev \ - freetds-dev \ - libfbclient2 \ - libib-util \ - firebird-dev \ - zlib1g-dev \ - libpq-dev \ - libsqlite3-dev \ - libpq-dev \ - libssl-dev \ - libpspell-dev \ - libedit-dev \ - libreadline-dev \ - librecode-dev \ - librdkafka-dev \ - libmm-dev \ - libxml2-dev \ - libssl-dev \ - libsnmp-dev \ - snmp \ - libxml2-dev \ - libsodium-dev \ - libnghttp2-dev \ - libssl-dev \ - libhiredis-dev \ cmake \ + firebird-dev \ + freetds-dev \ + libbz2-dev \ + libc-client-dev \ + libcurl4-openssl-dev \ + libenchant-dev \ + libfbclient2 \ + libfreetype6-dev \ + libgmp-dev \ + libhiredis-dev \ + libib-util \ + libicu-dev \ + libjpeg-dev \ + libkrb5-dev \ + libldap2-dev \ + libmagickwand-dev \ + libmcrypt-dev \ + libmemcached-dev \ + libnghttp2-dev \ + libpng-dev \ + libpq-dev \ + libpspell-dev \ + librdkafka-dev \ + librecode-dev \ + libsasl2-dev \ + libsnmp-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 \ - 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 \ - libpq5 \ - libaspell15 \ - librecode0 \ - librdkafka1 \ - snmp \ libnghttp2-14 \ - libhiredis0.13 \ + libpng16-16 \ + libpq5 \ + librdkafka1 \ + 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 f10c2e3..475c6c7 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 c518baa..d25929a 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 8ae6806..3444f79 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 df204b8..2a1c334 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 c920672..6585678 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 6d61515..fb129fc 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 ee4d98b..cfd73f3 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 bae41cd..927b4de 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 7beefbb..a360035 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 5e52601..512a6a9 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 f889ad1..56ec5c7 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 a23b866..8351f04 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 31d6cea..dd4b35e 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 33cd0c6..fa95a78 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 c3e7d7f..a8dfb41 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 318b952..df1a2e1 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 9faab88..fbd7178 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 05114b4..c71812e 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 4253891..5613dcd 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 a1ae34b..53fce99 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'] %} +{# 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 %} -{# 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'] %} - {{ 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'] %} +{# 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 %} -{# 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'] %} - {{ 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 95bb84a..572cb0b 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 9a1baea..b6182ea 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 306b0f4..37c71d6 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