diff --git a/Dockerfiles/mods/Dockerfile-5.6 b/Dockerfiles/mods/Dockerfile-5.6 index cff6697..c48f3d3 100644 --- a/Dockerfiles/mods/Dockerfile-5.6 +++ b/Dockerfiles/mods/Dockerfile-5.6 @@ -57,7 +57,6 @@ ENV BUILD_DEPS \ libpq-dev \ libsqlite3-dev \ libpq-dev \ - libssl-dev \ libpspell-dev \ libedit-dev \ libreadline-dev \ @@ -83,20 +82,20 @@ ENV BUILD_DEPS \ git ENV RUN_DEPS \ - librabbitmq1 \ + librabbitmq4 \ libenchant1c2a \ - libpng12-0 \ + libpng16-16 \ libjpeg62-turbo \ libxpm4 \ - libvpx1 \ + libvpx4 \ libfreetype6 \ - libmagickwand-6.q16-2 \ + libmagickwand-6.q16-3 \ libc-client2007e \ libfbclient2 \ - libicu52 \ + libicu57 \ libmcrypt4 \ libmemcachedutil2 \ - libmysqlclient18 \ + libmariadbclient18 \ libsybdb5 \ libfbclient2 \ libpq5 \ @@ -104,10 +103,10 @@ ENV RUN_DEPS \ libaspell15 \ librecode0 \ snmp \ - libnghttp2-5 \ - libtidy-0.99-0 \ + libnghttp2-14 \ + libtidy5 \ libxslt1.1 \ - libzip2 \ + libzip4 \ ca-certificates @@ -199,7 +198,6 @@ 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 \ @@ -351,8 +349,6 @@ RUN set -x \ && php-fpm -m | grep -oiE '^pgsql$' \ && php -m | grep -oiE '^phalcon$' \ && php-fpm -m | grep -oiE '^phalcon$' \ - && php -m | grep -oiE '^phar$' \ - && php-fpm -m | grep -oiE '^phar$' \ && php -m | grep -oiE '^posix$' \ && php-fpm -m | grep -oiE '^posix$' \ && php -m | grep -oiE '^pspell$' \ diff --git a/Dockerfiles/mods/Dockerfile-7.0 b/Dockerfiles/mods/Dockerfile-7.0 index 0f13eaf..84e40bb 100644 --- a/Dockerfiles/mods/Dockerfile-7.0 +++ b/Dockerfiles/mods/Dockerfile-7.0 @@ -81,18 +81,18 @@ ENV BUILD_DEPS \ git ENV RUN_DEPS \ - librabbitmq1 \ + librabbitmq4 \ libenchant1c2a \ - libpng12-0 \ + libpng16-16 \ libjpeg62-turbo \ libxpm4 \ - libvpx1 \ + libvpx4 \ libfreetype6 \ libwebp-dev \ - libmagickwand-6.q16-2 \ + libmagickwand-6.q16-3 \ libc-client2007e \ libfbclient2 \ - libicu52 \ + libicu57 \ libmcrypt4 \ libmemcachedutil2 \ libsybdb5 \ @@ -102,10 +102,10 @@ ENV RUN_DEPS \ libaspell15 \ librecode0 \ snmp \ - libnghttp2-5 \ - libtidy-0.99-0 \ + libnghttp2-14 \ + libtidy5 \ libxslt1.1 \ - libzip2 \ + libzip4 \ ca-certificates diff --git a/Dockerfiles/mods/Dockerfile-7.1 b/Dockerfiles/mods/Dockerfile-7.1 index 6ef603d..526d8f1 100644 --- a/Dockerfiles/mods/Dockerfile-7.1 +++ b/Dockerfiles/mods/Dockerfile-7.1 @@ -81,18 +81,18 @@ ENV BUILD_DEPS \ git ENV RUN_DEPS \ - librabbitmq1 \ + librabbitmq4 \ libenchant1c2a \ - libpng12-0 \ + libpng16-16 \ libjpeg62-turbo \ libxpm4 \ - libvpx1 \ + libvpx4 \ libfreetype6 \ libwebp-dev \ - libmagickwand-6.q16-2 \ + libmagickwand-6.q16-3 \ libc-client2007e \ libfbclient2 \ - libicu52 \ + libicu57 \ libmcrypt4 \ libmemcachedutil2 \ libsybdb5 \ @@ -102,10 +102,10 @@ ENV RUN_DEPS \ libaspell15 \ librecode0 \ snmp \ - libnghttp2-5 \ - libtidy-0.99-0 \ + libnghttp2-14 \ + libtidy5 \ libxslt1.1 \ - libzip2 \ + libzip4 \ ca-certificates diff --git a/Dockerfiles/mods/Dockerfile-7.2 b/Dockerfiles/mods/Dockerfile-7.2 index f28e2fc..3eccc85 100644 --- a/Dockerfiles/mods/Dockerfile-7.2 +++ b/Dockerfiles/mods/Dockerfile-7.2 @@ -129,7 +129,7 @@ RUN set -x \ && rm -rf ioncube \ && rm -rf ioncube.tar.gz \ \ - && pecl install amqp \ + && echo "/usr" | pecl install amqp \ && docker-php-ext-enable amqp \ && pecl install apcu \ && docker-php-ext-enable apcu \ diff --git a/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml index ab177f1..7542641 100644 --- a/build/ansible/group_vars/all.yml +++ b/build/ansible/group_vars/all.yml @@ -512,14 +512,23 @@ extensions_enabled: extensions_available: amqp: disabled: [7.3] - 7.2: + 5.3: type: pecl - run_dep: [librabbitmq4] + command: echo "/usr" | pecl install amqp + run_dep: [librabbitmq1] + 5.4: + type: pecl + command: echo "/usr" | pecl install amqp + run_dep: [librabbitmq1] + 5.5: + type: pecl + command: echo "/usr" | pecl install amqp + run_dep: [librabbitmq1] all: type: pecl command: echo "/usr" | pecl install amqp + run_dep: [librabbitmq4] build_dep: [librabbitmq-dev] - run_dep: [librabbitmq1] apcu: 5.3: type: pecl @@ -585,16 +594,22 @@ extensions_available: configure: --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 build_dep: [libpng-dev, libjpeg-dev, libxpm-dev, libvpx-dev, zlib1g-dev, libfreetype6-dev] run_dep: [libpng12-0, libjpeg62-turbo, libxpm4, libvpx1, libfreetype6] + 5.6: + type: builtin + pre: ln -s /usr/lib/x86_64-linux-gnu/libXpm.* /usr/lib/ + configure: --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 + build_dep: [libpng-dev, libjpeg-dev, libxpm-dev, libvpx-dev, zlib1g-dev, libfreetype6-dev] + run_dep: [libpng16-16, libjpeg62-turbo, libxpm4, libvpx4, libfreetype6] 7.0: type: builtin configure: --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 build_dep: [libpng-dev, libjpeg-dev, libxpm-dev, libvpx-dev, zlib1g-dev, libfreetype6-dev, libwebp-dev] - run_dep: [libpng12-0, libjpeg62-turbo, libxpm4, libvpx1, libfreetype6, libwebp-dev] + run_dep: [libpng16-16, libjpeg62-turbo, libxpm4, libvpx4, libfreetype6, libwebp-dev] 7.1: type: builtin configure: --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 build_dep: [libpng-dev, libjpeg-dev, libxpm-dev, libvpx-dev, zlib1g-dev, libfreetype6-dev, libwebp-dev] - run_dep: [libpng12-0, libjpeg62-turbo, libxpm4, libvpx1, libfreetype6, libwebp-dev] + run_dep: [libpng16-16, libjpeg62-turbo, libxpm4, libvpx4, libfreetype6, libwebp-dev] 7.2: type: builtin configure: --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 @@ -634,6 +649,15 @@ extensions_available: version: 3.3.0 build_dep: [libmagickwand-dev] run_dep: [libmagickwand-6.q16-2] + 5.6: + type: pecl + run_dep: [libmagickwand-6.q16-3] + 7.0: + type: pecl + run_dep: [libmagickwand-6.q16-3] + 7.1: + type: pecl + run_dep: [libmagickwand-6.q16-3] 7.2: type: pecl run_dep: [libmagickwand-6.q16-3] @@ -657,6 +681,15 @@ extensions_available: build_dep: [libfbclient2, libib-util, firebird-dev] run_dep: [libfbclient2] intl: + 5.6: + type: builtin + run_dep: [libicu57] + 7.0: + type: builtin + run_dep: [libicu57] + 7.1: + type: builtin + run_dep: [libicu57] 7.2: type: builtin run_dep: [libicu57] @@ -785,6 +818,9 @@ extensions_available: type: pecl mysql: disabled: [7.0, 7.1, 7.2, 7.3] # Deprecated in newer versions + 5.6: + type: builtin + run_dep: [libmariadbclient18] all: type: builtin run_dep: [libmysqlclient18] @@ -877,7 +913,7 @@ extensions_available: command: cd build && ./install phar: # https://github.com/docker-library/php/issues/618 - disabled: [7.0] # TODO: Currently disabled due to bug in built + disabled: [5.6, 7.0] # TODO: Currently disabled due to bug in built all: type: builtin build_dep: [libssl-dev] @@ -943,18 +979,20 @@ extensions_available: 5.3: type: pecl version: 1.9.23 + run_dep: [libnghttp2-5] 5.4: type: pecl version: 1.9.23 + run_dep: [libnghttp2-5] 5.5: type: pecl version: 1.9.23 + run_dep: [libnghttp2-5] 5.6: type: pecl version: 1.9.23 7.2: type: pecl - run_dep: [libnghttp2-14] 7.3: type: git git_url: https://github.com/swoole/swoole-src @@ -997,7 +1035,7 @@ extensions_available: all: type: pecl build_dep: [libnghttp2-dev, libssl-dev] - run_dep: [libnghttp2-5] + run_dep: [libnghttp2-14] sysvmsg: all: type: builtin @@ -1008,16 +1046,22 @@ extensions_available: all: type: builtin tidy: - 7.2: - type: builtin - run_dep: [libtidy5] - 7.3: - type: builtin - run_dep: [libtidy5] - all: + 5.3: type: builtin build_dep: [libtidy-dev] run_dep: [libtidy-0.99-0] + 5.4: + type: builtin + build_dep: [libtidy-dev] + run_dep: [libtidy-0.99-0] + 5.5: + type: builtin + build_dep: [libtidy-dev] + run_dep: [libtidy-0.99-0] + all: + type: builtin + build_dep: [libtidy-dev] + run_dep: [libtidy5] tokenizer: all: type: builtin @@ -1103,6 +1147,21 @@ extensions_available: configure: --with-zlib-dir=/usr --with-pcre-dir=/usr build_dep: [zlib1g-dev] run_dep: [] + 5.6: + type: builtin + configure: --with-zlib-dir=/usr --with-pcre-dir=/usr --with-libzip + build_dep: [zlib1g-dev, libzip-dev] + run_dep: [libzip4] + 7.0: + type: builtin + configure: --with-zlib-dir=/usr --with-pcre-dir=/usr --with-libzip + build_dep: [zlib1g-dev, libzip-dev] + run_dep: [libzip4] + 7.1: + type: builtin + configure: --with-zlib-dir=/usr --with-pcre-dir=/usr --with-libzip + build_dep: [zlib1g-dev, libzip-dev] + run_dep: [libzip4] 7.2: type: builtin configure: --with-zlib-dir=/usr --with-pcre-dir=/usr --with-libzip