diff --git a/Dockerfiles/mods/Dockerfile-5.6 b/Dockerfiles/mods/Dockerfile-5.6 index cff6697c..ff4af053 100644 --- a/Dockerfiles/mods/Dockerfile-5.6 +++ b/Dockerfiles/mods/Dockerfile-5.6 @@ -30,6 +30,7 @@ ENV BUILD_DEPS \ libvpx-dev \ zlib1g-dev \ libfreetype6-dev \ + libwebp-dev \ libgmp-dev \ libmagickwand-dev \ libc-client-dev \ @@ -57,7 +58,6 @@ ENV BUILD_DEPS \ libpq-dev \ libsqlite3-dev \ libpq-dev \ - libssl-dev \ libpspell-dev \ libedit-dev \ libreadline-dev \ @@ -83,20 +83,21 @@ ENV BUILD_DEPS \ git ENV RUN_DEPS \ - librabbitmq1 \ + librabbitmq4 \ libenchant1c2a \ - libpng12-0 \ + libpng16-16 \ libjpeg62-turbo \ libxpm4 \ - libvpx1 \ + libvpx4 \ libfreetype6 \ - libmagickwand-6.q16-2 \ + libwebp6 \ + libmagickwand-6.q16-3 \ libc-client2007e \ libfbclient2 \ - libicu52 \ + libicu57 \ libmcrypt4 \ libmemcachedutil2 \ - libmysqlclient18 \ + libmariadbclient18 \ libsybdb5 \ libfbclient2 \ libpq5 \ @@ -104,10 +105,10 @@ ENV RUN_DEPS \ libaspell15 \ librecode0 \ snmp \ - libnghttp2-5 \ - libtidy-0.99-0 \ + libnghttp2-14 \ + libtidy5 \ libxslt1.1 \ - libzip2 \ + libzip4 \ ca-certificates @@ -199,7 +200,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 +351,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 0f13eaf1..187c5b12 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 \ + libwebp6 \ + 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 6ef603d4..0fbbdb91 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 \ + libwebp6 \ + 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 f28e2fcc..3eccc85b 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/Dockerfiles/mods/Dockerfile-7.3 b/Dockerfiles/mods/Dockerfile-7.3 index 91bdc010..184f5601 100644 --- a/Dockerfiles/mods/Dockerfile-7.3 +++ b/Dockerfiles/mods/Dockerfile-7.3 @@ -219,7 +219,7 @@ RUN set -x \ --enable-mysqlnd \ --enable-coroutine \ --enable-picohttpparser \ - --enable-timewheel \ + #`--enable-timewheel` \ #`--enable-hugepage` \ #`--enable-asan` \ #`--with-phpx-dir=` \ diff --git a/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml index ab177f1a..4894937f 100644 --- a/build/ansible/group_vars/all.yml +++ b/build/ansible/group_vars/all.yml @@ -512,14 +512,17 @@ extensions_enabled: extensions_available: amqp: disabled: [7.3] - 7.2: - type: pecl - run_dep: [librabbitmq4] + 5.3: + run_dep: [librabbitmq1] + 5.4: + run_dep: [librabbitmq1] + 5.5: + run_dep: [librabbitmq1] all: type: pecl command: echo "/usr" | pecl install amqp build_dep: [librabbitmq-dev] - run_dep: [librabbitmq1] + run_dep: [librabbitmq4] apcu: 5.3: type: pecl @@ -585,32 +588,40 @@ 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.4: + 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: [libpng12-0, libjpeg62-turbo, libxpm4, libvpx1, libfreetype6] + 5.5: + 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: [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 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] 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] 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 - build_dep: [libpng-dev, libjpeg-dev, libxpm-dev, libvpx-dev, zlib1g-dev, libfreetype6-dev, libwebp-dev] - run_dep: [libpng16-16, libjpeg62-turbo, libxpm4, libvpx4, libfreetype6, libwebp6] 7.3: 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 - build_dep: [libpng-dev, libjpeg-dev, libxpm-dev, libvpx-dev, zlib1g-dev, libfreetype6-dev, libwebp-dev] - run_dep: [libpng16-16, libjpeg62-turbo, libxpm4, libvpx4, libfreetype6, libwebp6] all: 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: [libpng12-0, libjpeg62-turbo, libxpm4, libvpx1, libfreetype6] + build_dep: [libpng-dev, libjpeg-dev, libxpm-dev, libvpx-dev, zlib1g-dev, libfreetype6-dev, libwebp-dev] + run_dep: [libpng16-16, libjpeg62-turbo, libxpm4, libvpx4, libfreetype6, libwebp6] gettext: all: type: builtin @@ -632,18 +643,17 @@ extensions_available: 5.3: type: pecl version: 3.3.0 - build_dep: [libmagickwand-dev] run_dep: [libmagickwand-6.q16-2] - 7.2: + 5.4: type: pecl - run_dep: [libmagickwand-6.q16-3] - 7.3: + run_dep: [libmagickwand-6.q16-2] + 5.5: type: pecl - run_dep: [libmagickwand-6.q16-3] + run_dep: [libmagickwand-6.q16-2] all: type: pecl build_dep: [libmagickwand-dev] - run_dep: [libmagickwand-6.q16-2] + run_dep: [libmagickwand-6.q16-3] imap: all: type: builtin @@ -657,16 +667,19 @@ extensions_available: build_dep: [libfbclient2, libib-util, firebird-dev] run_dep: [libfbclient2] intl: - 7.2: + 5.3: type: builtin - run_dep: [libicu57] - 7.3: + run_dep: [libicu52] + 5.4: type: builtin - run_dep: [libicu57] + run_dep: [libicu52] + 5.5: + type: builtin + run_dep: [libicu52] all: type: builtin build_dep: [libicu-dev] - run_dep: [libicu52] + run_dep: [libicu57] ioncube: disabled: [7.3] all: @@ -759,11 +772,9 @@ extensions_available: 5.3: type: pecl version: 0.6.3 - build_dep: [libssl-dev, libsasl2-dev] 5.4: type: pecl version: 1.2.11 - build_dep: [libssl-dev, libsasl2-dev] all: type: pecl build_dep: [libssl-dev, libsasl2-dev] @@ -785,6 +796,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 +891,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] @@ -931,10 +945,7 @@ extensions_available: type: builtin sodium: disabled: [5.3, 5.4, 5.5, 5.6, 7.0, 7.1] - 7.2: - type: builtin - build_dep: [libsodium-dev] - 7.3: + all: type: builtin build_dep: [libsodium-dev] spl: @@ -943,18 +954,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 @@ -981,7 +994,7 @@ extensions_available: --enable-mysqlnd \ --enable-coroutine \ --enable-picohttpparser \ - --enable-timewheel \ + #`--enable-timewheel` \ #`--enable-hugepage` \ #`--enable-asan` \ #`--with-phpx-dir=` \ @@ -997,7 +1010,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 +1021,19 @@ extensions_available: all: type: builtin tidy: - 7.2: + 5.3: type: builtin - run_dep: [libtidy5] - 7.3: + run_dep: [libtidy-0.99-0] + 5.4: type: builtin - run_dep: [libtidy5] + run_dep: [libtidy-0.99-0] + 5.5: + type: builtin + run_dep: [libtidy-0.99-0] all: type: builtin build_dep: [libtidy-dev] - run_dep: [libtidy-0.99-0] + run_dep: [libtidy5] tokenizer: all: type: builtin @@ -1103,16 +1119,8 @@ extensions_available: configure: --with-zlib-dir=/usr --with-pcre-dir=/usr build_dep: [zlib1g-dev] run_dep: [] - 7.2: - type: builtin - configure: --with-zlib-dir=/usr --with-pcre-dir=/usr --with-libzip - run_dep: [libzip4] - 7.3: - type: builtin - configure: --with-zlib-dir=/usr --with-pcre-dir=/usr --with-libzip - run_dep: [libzip4] all: type: builtin configure: --with-zlib-dir=/usr --with-pcre-dir=/usr --with-libzip build_dep: [zlib1g-dev, libzip-dev] - run_dep: [libzip2] + run_dep: [libzip4]