From b352de69397bab9c10cc4f4fb33067cbaa3f0eef Mon Sep 17 00:00:00 2001 From: cytopia Date: Fri, 18 Mar 2022 12:19:00 +0100 Subject: [PATCH 01/19] Fixed install of mongodb-org-shell and mongodb-org-tools --- Dockerfiles/work/Dockerfile-5.2 | 17 +++++++++++++++-- Dockerfiles/work/Dockerfile-5.3 | 17 +++++++++++++++-- Dockerfiles/work/Dockerfile-5.4 | 17 +++++++++++++++-- Dockerfiles/work/Dockerfile-5.5 | 17 +++++++++++++++-- Dockerfiles/work/Dockerfile-5.6 | 17 +++++++++++++++-- Dockerfiles/work/Dockerfile-7.0 | 17 +++++++++++++++-- Dockerfiles/work/Dockerfile-7.1 | 17 +++++++++++++++-- Dockerfiles/work/Dockerfile-7.2 | 17 +++++++++++++++-- Dockerfiles/work/Dockerfile-7.3 | 17 +++++++++++++++-- Dockerfiles/work/Dockerfile-7.4 | 17 +++++++++++++++-- Dockerfiles/work/Dockerfile-8.0 | 17 +++++++++++++++-- Dockerfiles/work/Dockerfile-8.1 | 17 +++++++++++++++-- Dockerfiles/work/Dockerfile-8.2 | 17 +++++++++++++++-- Makefile | 1 + build/ansible/DOCKERFILES/Dockerfile-work.j2 | 17 +++++++++++++++-- 15 files changed, 211 insertions(+), 28 deletions(-) diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2 index 3ab3c17c..255c3083 100644 --- a/Dockerfiles/work/Dockerfile-5.2 +++ b/Dockerfiles/work/Dockerfile-5.2 @@ -2,6 +2,7 @@ FROM devilbox/php-fpm:5.2-prod MAINTAINER "cytopia" +ARG ARCH ### ### Labels @@ -103,8 +104,6 @@ RUN set -eux \ libyaml-dev \ locales \ make \ - mongodb-org-shell \ - mongodb-org-tools \ moreutils \ mysql-client \ mupdf \ @@ -145,6 +144,20 @@ RUN set -eux \ && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) +### +### Instal Architecture Dependent software +### +RUN set -eux \ + && if [ "${ARCH}" = "linux/amd64" ]; \ + DEBIAN_FRONTEND=noninteractive apt-get update -q \ + && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + mongodb-org-shell \ + mongodb-org-tools; \ + fi \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ + && rm -rf /var/lib/apt/lists/* \ + + ### ### Install custom software ### diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3 index 80d4d670..d3e119df 100644 --- a/Dockerfiles/work/Dockerfile-5.3 +++ b/Dockerfiles/work/Dockerfile-5.3 @@ -2,6 +2,7 @@ FROM devilbox/php-fpm:5.3-prod MAINTAINER "cytopia" +ARG ARCH ### ### Labels @@ -103,8 +104,6 @@ RUN set -eux \ libyaml-dev \ locales \ make \ - mongodb-org-shell \ - mongodb-org-tools \ moreutils \ mysql-client \ mupdf \ @@ -145,6 +144,20 @@ RUN set -eux \ && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) +### +### Instal Architecture Dependent software +### +RUN set -eux \ + && if [ "${ARCH}" = "linux/amd64" ]; \ + DEBIAN_FRONTEND=noninteractive apt-get update -q \ + && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + mongodb-org-shell \ + mongodb-org-tools; \ + fi \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ + && rm -rf /var/lib/apt/lists/* \ + + ### ### Install custom software ### diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index 085cdf9a..f9322d76 100644 --- a/Dockerfiles/work/Dockerfile-5.4 +++ b/Dockerfiles/work/Dockerfile-5.4 @@ -2,6 +2,7 @@ FROM devilbox/php-fpm:5.4-prod MAINTAINER "cytopia" +ARG ARCH ### ### Labels @@ -102,8 +103,6 @@ RUN set -eux \ libyaml-dev \ locales \ make \ - mongodb-org-shell \ - mongodb-org-tools \ moreutils \ mysql-client \ mupdf \ @@ -144,6 +143,20 @@ RUN set -eux \ && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) +### +### Instal Architecture Dependent software +### +RUN set -eux \ + && if [ "${ARCH}" = "linux/amd64" ]; \ + DEBIAN_FRONTEND=noninteractive apt-get update -q \ + && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + mongodb-org-shell \ + mongodb-org-tools; \ + fi \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ + && rm -rf /var/lib/apt/lists/* \ + + ### ### Install custom software ### diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index 32ab4a44..6bee2802 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -2,6 +2,7 @@ FROM devilbox/php-fpm:5.5-prod MAINTAINER "cytopia" +ARG ARCH ### ### Labels @@ -102,8 +103,6 @@ RUN set -eux \ libyaml-dev \ locales \ make \ - mongodb-org-shell \ - mongodb-org-tools \ moreutils \ mysql-client \ mupdf \ @@ -144,6 +143,20 @@ RUN set -eux \ && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) +### +### Instal Architecture Dependent software +### +RUN set -eux \ + && if [ "${ARCH}" = "linux/amd64" ]; \ + DEBIAN_FRONTEND=noninteractive apt-get update -q \ + && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + mongodb-org-shell \ + mongodb-org-tools; \ + fi \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ + && rm -rf /var/lib/apt/lists/* \ + + ### ### Install custom software ### diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index 6427ca2f..07c5cc4e 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -2,6 +2,7 @@ FROM devilbox/php-fpm:5.6-prod MAINTAINER "cytopia" +ARG ARCH ### ### Labels @@ -103,8 +104,6 @@ RUN set -eux \ libyaml-dev \ locales \ make \ - mongodb-org-shell \ - mongodb-org-tools \ moreutils \ mysql-client \ mupdf \ @@ -146,6 +145,20 @@ RUN set -eux \ && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) +### +### Instal Architecture Dependent software +### +RUN set -eux \ + && if [ "${ARCH}" = "linux/amd64" ]; \ + DEBIAN_FRONTEND=noninteractive apt-get update -q \ + && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + mongodb-org-shell \ + mongodb-org-tools; \ + fi \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ + && rm -rf /var/lib/apt/lists/* \ + + ### ### Install custom software ### diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index f7251380..264ec2b5 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -2,6 +2,7 @@ FROM devilbox/php-fpm:7.0-prod MAINTAINER "cytopia" +ARG ARCH ### ### Labels @@ -103,8 +104,6 @@ RUN set -eux \ libyaml-dev \ locales \ make \ - mongodb-org-shell \ - mongodb-org-tools \ moreutils \ mysql-client \ mupdf \ @@ -146,6 +145,20 @@ RUN set -eux \ && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) +### +### Instal Architecture Dependent software +### +RUN set -eux \ + && if [ "${ARCH}" = "linux/amd64" ]; \ + DEBIAN_FRONTEND=noninteractive apt-get update -q \ + && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + mongodb-org-shell \ + mongodb-org-tools; \ + fi \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ + && rm -rf /var/lib/apt/lists/* \ + + ### ### Install custom software ### diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index 6cacdfef..59e0994e 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -2,6 +2,7 @@ FROM devilbox/php-fpm:7.1-prod MAINTAINER "cytopia" +ARG ARCH ### ### Labels @@ -103,8 +104,6 @@ RUN set -eux \ libyaml-dev \ locales \ make \ - mongodb-org-shell \ - mongodb-org-tools \ moreutils \ mariadb-client \ mupdf \ @@ -145,6 +144,20 @@ RUN set -eux \ && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) +### +### Instal Architecture Dependent software +### +RUN set -eux \ + && if [ "${ARCH}" = "linux/amd64" ]; \ + DEBIAN_FRONTEND=noninteractive apt-get update -q \ + && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + mongodb-org-shell \ + mongodb-org-tools; \ + fi \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ + && rm -rf /var/lib/apt/lists/* \ + + ### ### Install custom software ### diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index c8ba9b8e..692217a3 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -2,6 +2,7 @@ FROM devilbox/php-fpm:7.2-prod MAINTAINER "cytopia" +ARG ARCH ### ### Labels @@ -103,8 +104,6 @@ RUN set -eux \ libyaml-dev \ locales \ make \ - mongodb-org-shell \ - mongodb-org-tools \ moreutils \ mariadb-client \ mupdf \ @@ -145,6 +144,20 @@ RUN set -eux \ && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) +### +### Instal Architecture Dependent software +### +RUN set -eux \ + && if [ "${ARCH}" = "linux/amd64" ]; \ + DEBIAN_FRONTEND=noninteractive apt-get update -q \ + && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + mongodb-org-shell \ + mongodb-org-tools; \ + fi \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ + && rm -rf /var/lib/apt/lists/* \ + + ### ### Install custom software ### diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index d1badf0c..95527376 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -2,6 +2,7 @@ FROM devilbox/php-fpm:7.3-prod MAINTAINER "cytopia" +ARG ARCH ### ### Labels @@ -103,8 +104,6 @@ RUN set -eux \ libyaml-dev \ locales \ make \ - mongodb-org-shell \ - mongodb-org-tools \ moreutils \ mariadb-client \ mupdf \ @@ -145,6 +144,20 @@ RUN set -eux \ && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) +### +### Instal Architecture Dependent software +### +RUN set -eux \ + && if [ "${ARCH}" = "linux/amd64" ]; \ + DEBIAN_FRONTEND=noninteractive apt-get update -q \ + && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + mongodb-org-shell \ + mongodb-org-tools; \ + fi \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ + && rm -rf /var/lib/apt/lists/* \ + + ### ### Install custom software ### diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4 index a62d5cc3..190f2850 100644 --- a/Dockerfiles/work/Dockerfile-7.4 +++ b/Dockerfiles/work/Dockerfile-7.4 @@ -2,6 +2,7 @@ FROM devilbox/php-fpm:7.4-prod MAINTAINER "cytopia" +ARG ARCH ### ### Labels @@ -103,8 +104,6 @@ RUN set -eux \ libyaml-dev \ locales \ make \ - mongodb-org-shell \ - mongodb-org-tools \ moreutils \ mariadb-client \ mupdf \ @@ -145,6 +144,20 @@ RUN set -eux \ && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) +### +### Instal Architecture Dependent software +### +RUN set -eux \ + && if [ "${ARCH}" = "linux/amd64" ]; \ + DEBIAN_FRONTEND=noninteractive apt-get update -q \ + && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + mongodb-org-shell \ + mongodb-org-tools; \ + fi \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ + && rm -rf /var/lib/apt/lists/* \ + + ### ### Install custom software ### diff --git a/Dockerfiles/work/Dockerfile-8.0 b/Dockerfiles/work/Dockerfile-8.0 index 6ffdc826..bd137f50 100644 --- a/Dockerfiles/work/Dockerfile-8.0 +++ b/Dockerfiles/work/Dockerfile-8.0 @@ -2,6 +2,7 @@ FROM devilbox/php-fpm:8.0-prod MAINTAINER "cytopia" +ARG ARCH ### ### Labels @@ -103,8 +104,6 @@ RUN set -eux \ libyaml-dev \ locales \ make \ - mongodb-org-shell \ - mongodb-org-tools \ moreutils \ mariadb-client \ mupdf \ @@ -145,6 +144,20 @@ RUN set -eux \ && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) +### +### Instal Architecture Dependent software +### +RUN set -eux \ + && if [ "${ARCH}" = "linux/amd64" ]; \ + DEBIAN_FRONTEND=noninteractive apt-get update -q \ + && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + mongodb-org-shell \ + mongodb-org-tools; \ + fi \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ + && rm -rf /var/lib/apt/lists/* \ + + ### ### Install custom software ### diff --git a/Dockerfiles/work/Dockerfile-8.1 b/Dockerfiles/work/Dockerfile-8.1 index 676a4fc7..2c8ef39e 100644 --- a/Dockerfiles/work/Dockerfile-8.1 +++ b/Dockerfiles/work/Dockerfile-8.1 @@ -2,6 +2,7 @@ FROM devilbox/php-fpm:8.1-prod MAINTAINER "cytopia" +ARG ARCH ### ### Labels @@ -103,8 +104,6 @@ RUN set -eux \ libyaml-dev \ locales \ make \ - mongodb-org-shell \ - mongodb-org-tools \ moreutils \ mariadb-client \ mupdf \ @@ -145,6 +144,20 @@ RUN set -eux \ && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) +### +### Instal Architecture Dependent software +### +RUN set -eux \ + && if [ "${ARCH}" = "linux/amd64" ]; \ + DEBIAN_FRONTEND=noninteractive apt-get update -q \ + && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + mongodb-org-shell \ + mongodb-org-tools; \ + fi \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ + && rm -rf /var/lib/apt/lists/* \ + + ### ### Install custom software ### diff --git a/Dockerfiles/work/Dockerfile-8.2 b/Dockerfiles/work/Dockerfile-8.2 index 650663ee..abcc8fe1 100644 --- a/Dockerfiles/work/Dockerfile-8.2 +++ b/Dockerfiles/work/Dockerfile-8.2 @@ -2,6 +2,7 @@ FROM devilbox/php-fpm:8.2-prod MAINTAINER "cytopia" +ARG ARCH ### ### Labels @@ -103,8 +104,6 @@ RUN set -eux \ libyaml-dev \ locales \ make \ - mongodb-org-shell \ - mongodb-org-tools \ moreutils \ mariadb-client \ mupdf \ @@ -145,6 +144,20 @@ RUN set -eux \ && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) +### +### Instal Architecture Dependent software +### +RUN set -eux \ + && if [ "${ARCH}" = "linux/amd64" ]; \ + DEBIAN_FRONTEND=noninteractive apt-get update -q \ + && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + mongodb-org-shell \ + mongodb-org-tools; \ + fi \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ + && rm -rf /var/lib/apt/lists/* \ + + ### ### Install custom software ### diff --git a/Makefile b/Makefile index 6c193d53..13fd8448 100644 --- a/Makefile +++ b/Makefile @@ -252,6 +252,7 @@ build-work: --label "org.opencontainers.image.created"="$$(date --rfc-3339=s)" \ --label "org.opencontainers.image.version"="$$(git rev-parse --abbrev-ref HEAD)" \ --label "org.opencontainers.image.revision"="$$(git rev-parse HEAD)" \ + --build-arg ARCH=$(ARCH) \ $(ARGS) \ -t $(IMAGE):${VERSION}-work \ -f $(DIR)/work/Dockerfile-${VERSION} $(DIR)/work diff --git a/build/ansible/DOCKERFILES/Dockerfile-work.j2 b/build/ansible/DOCKERFILES/Dockerfile-work.j2 index 2700a80a..375e6b8a 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-work.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-work.j2 @@ -2,6 +2,7 @@ FROM devilbox/php-fpm:{{ php_version }}-prod MAINTAINER "cytopia" +ARG ARCH ### ### Labels @@ -118,8 +119,6 @@ RUN set -eux \ libyaml-dev \ locales \ make \ - mongodb-org-shell \ - mongodb-org-tools \ moreutils \ {% if php_version in [7.1, 7.2, 7.3, 7.4, 8.0, 8.1, 8.2] %} mariadb-client \ @@ -167,6 +166,20 @@ RUN set -eux \ && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) +### +### Instal Architecture Dependent software +### +RUN set -eux \ + && if [ "${ARCH}" = "linux/amd64" ]; \ + DEBIAN_FRONTEND=noninteractive apt-get update -q \ + && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ + mongodb-org-shell \ + mongodb-org-tools; \ + fi \ + && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ + && rm -rf /var/lib/apt/lists/* \ + + ### ### Install custom software ### From 919a6887a60da9b21d2a211f19c35e5d12297e51 Mon Sep 17 00:00:00 2001 From: cytopia Date: Fri, 18 Mar 2022 12:21:37 +0100 Subject: [PATCH 02/19] Removed amqp on PHP 5.3 --- Dockerfiles/mods/Dockerfile-5.3 | 15 --------------- README.md | 2 +- build/ansible/group_vars/all/mods.yml | 9 +++++---- 3 files changed, 6 insertions(+), 20 deletions(-) diff --git a/Dockerfiles/mods/Dockerfile-5.3 b/Dockerfiles/mods/Dockerfile-5.3 index 69c73c85..5b6a13f2 100644 --- a/Dockerfiles/mods/Dockerfile-5.3 +++ b/Dockerfiles/mods/Dockerfile-5.3 @@ -33,7 +33,6 @@ RUN set -eux \ libpng-dev \ libpq-dev \ libpspell-dev \ - librabbitmq-dev \ librdkafka-dev \ libsasl2-dev \ libsnmp-dev \ @@ -66,17 +65,6 @@ RUN set -eux \ echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \ fi -# -------------------- Installing PHP Extension: amqp -------------------- -RUN set -eux \ - # Installation: Version specific - # Type: PECL extension - # Default: Pecl command - && pecl install amqp-1.9.3 \ - # Enabling - && docker-php-ext-enable amqp \ - && true - - # -------------------- Installing PHP Extension: apcu -------------------- RUN set -eux \ # Installation: Version specific @@ -691,7 +679,6 @@ RUN set -eux \ libnghttp2-14 \ libpng16-16 \ libpq5 \ - librabbitmq4 \ librdkafka1 \ librecode0 \ libsybdb5 \ @@ -741,8 +728,6 @@ RUN set -eux \ && 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$' \ && php-fpm -m | grep -oiE '^apcu$' \ && php -m | grep -oiE '^bcmath$' \ diff --git a/README.md b/README.md index 9d50be14..90a28472 100644 --- a/README.md +++ b/README.md @@ -664,7 +664,7 @@ Check out this table to see which Docker image provides what PHP modules. 5.3 Core, ctype, curl, date, dom, ereg, fileinfo, filter, hash, iconv, json, libxml, mysql, mysqlnd, openssl, pcre, PDO, pdo_sqlite, Phar, posix, readline, recode, Reflection, session, SimpleXML, SPL, SQLite, sqlite3, standard, tokenizer, xml, xmlreader, xmlwriter, zlib - amqp, apc, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, ereg, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imap, interbase, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongo, msgpack, mysql, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pgsql, phalcon, Phar, posix, pspell, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, SPL, SQLite, sqlite3, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, uuid, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib + apc, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, ereg, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imap, interbase, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongo, msgpack, mysql, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pgsql, phalcon, Phar, posix, pspell, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, SPL, SQLite, sqlite3, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, uuid, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib 5.4 diff --git a/build/ansible/group_vars/all/mods.yml b/build/ansible/group_vars/all/mods.yml index 19c907f1..85c00389 100644 --- a/build/ansible/group_vars/all/mods.yml +++ b/build/ansible/group_vars/all/mods.yml @@ -146,13 +146,14 @@ extensions_enabled: # command: [required] Custom command to install and enable a module extensions_available: amqp: - disabled: [] + # Does not build on arm64 on PHP 5.3 + disabled: [5.3] 5.2: type: pecl version: 1.6.1 - 5.3: - type: pecl - version: 1.9.3 + #5.3: + # type: pecl + # version: 1.9.3 5.4: type: pecl version: 1.9.3 From 9505770a8c7dc96663d5b52279b973dd01c85d1d Mon Sep 17 00:00:00 2001 From: cytopia Date: Fri, 18 Mar 2022 12:22:06 +0100 Subject: [PATCH 03/19] Update nightly --- .github/workflows/nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 3830dfbe..395575e0 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -41,7 +41,7 @@ jobs: - '8.2' refs: - 'master' - - '0.135' + - '0.136' steps: # ------------------------------------------------------------ From cb9437b4f3865651a3111a35aeabe24fc0eb296b Mon Sep 17 00:00:00 2001 From: cytopia Date: Fri, 18 Mar 2022 12:22:22 +0100 Subject: [PATCH 04/19] Updated CHANGELOG --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 22e92580..3df53d6a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,15 @@ ## Unreleased +## Release 0.136 + +#### Fixed +- Fixed `mongodb-org-shell` and `mongodb-org-tools` install + +#### Changed +- Removed `amqp` on PHP 5.3 + + ## Release 0.135 #### Fixed From 2d489beb2cb44cdb961b21999de02c9c8496b66f Mon Sep 17 00:00:00 2001 From: cytopia Date: Fri, 18 Mar 2022 12:22:37 +0100 Subject: [PATCH 05/19] Test arm64 builds --- .github/workflows/arm64.yml | 352 ++++++++++++++++++++++++++++++++++++ 1 file changed, 352 insertions(+) create mode 100644 .github/workflows/arm64.yml diff --git a/.github/workflows/arm64.yml b/.github/workflows/arm64.yml new file mode 100644 index 00000000..a72ed903 --- /dev/null +++ b/.github/workflows/arm64.yml @@ -0,0 +1,352 @@ +--- + +# ------------------------------------------------------------------------------------------------- +# Job Name +# ------------------------------------------------------------------------------------------------- +name: build-arm64 + + +# ------------------------------------------------------------------------------------------------- +# When to run +# ------------------------------------------------------------------------------------------------- +on: + # Runs on Push + push: + + +# ------------------------------------------------------------------------------------------------- +# What to run +# ------------------------------------------------------------------------------------------------- +jobs: + build: + name: "[ PHP-${{ matrix.version }} (arm64) ]" + runs-on: ubuntu-latest + strategy: + fail-fast: False + matrix: + version: + #- '5.2' # No arm64 version available + - '5.3' + - '5.4' + - '5.5' + - '5.6' + - '7.0' + - '7.1' + - '7.2' + - '7.3' + - '7.4' + - '8.0' + - '8.1' + - '8.2' + steps: + + # ------------------------------------------------------------ + # Setup repository + # ------------------------------------------------------------ + - name: Checkout repository + uses: actions/checkout@v2 + with: + fetch-depth: 0 + + - name: Set variables + id: vars + run: | + + # Retrieve git info (tags, etc) + git fetch --all + + # Branch, Tag or Commit + GIT_TYPE="$( \ + curl -sS https://raw.githubusercontent.com/cytopia/git-tools/master/git-info.sh \ + | sh \ + | grep '^GIT_TYPE' \ + | sed 's|.*=||g' \ + )" + # Branch name, Tag name or Commit Hash + GIT_SLUG="$( \ + curl -sS https://raw.githubusercontent.com/cytopia/git-tools/master/git-info.sh \ + | sh \ + | grep '^GIT_NAME' \ + | sed 's|.*=||g' \ + )" + # Docker Tag + if [ "${GIT_TYPE}" = "BRANCH" ] && [ "${GIT_SLUG}" = "master" ]; then + DOCKER_TAG_BASE="${VERSION}-base" + DOCKER_TAG_MODS="${VERSION}-mods" + DOCKER_TAG_PROD="${VERSION}-prod" + DOCKER_TAG_WORK="${VERSION}-work" + else + DOCKER_TAG_BASE="${VERSION}-base-${GIT_SLUG}" + DOCKER_TAG_MODS="${VERSION}-mods-${GIT_SLUG}" + DOCKER_TAG_PROD="${VERSION}-prod-${GIT_SLUG}" + DOCKER_TAG_WORK="${VERSION}-work-${GIT_SLUG}" + fi + + # Output + echo "GIT_TYPE=${GIT_TYPE}" + echo "GIT_SLUG=${GIT_SLUG}" + echo "DOCKER_TAG_BASE=${DOCKER_TAG_BASE}" + echo "DOCKER_TAG_MODS=${DOCKER_TAG_MODS}" + echo "DOCKER_TAG_PROD=${DOCKER_TAG_PROD}" + echo "DOCKER_TAG_WORK=${DOCKER_TAG_WORK}" + + # Export variable + # https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-commands-for-github-actions#environment-files + echo "GIT_TYPE=${GIT_TYPE}" >> ${GITHUB_ENV} + echo "GIT_SLUG=${GIT_SLUG}" >> ${GITHUB_ENV} + echo "DOCKER_TAG_BASE=${DOCKER_TAG_BASE}" >> ${GITHUB_ENV} + echo "DOCKER_TAG_MODS=${DOCKER_TAG_MODS}" >> ${GITHUB_ENV} + echo "DOCKER_TAG_PROD=${DOCKER_TAG_PROD}" >> ${GITHUB_ENV} + echo "DOCKER_TAG_WORK=${DOCKER_TAG_WORK}" >> ${GITHUB_ENV} + env: + VERSION: ${{ matrix.version }} + + - name: "[SETUP] Setup QEMU environment" + uses: docker/setup-qemu-action@v1 + with: + image: tonistiigi/binfmt:latest + platforms: all + + + # ------------------------------------------------------------ + # Base + # ------------------------------------------------------------ + - name: Build Base + run: | + retry() { + for n in $(seq ${RETRIES}); do + echo "[${n}/${RETRIES}] ${*}"; + if eval "${*}"; then + echo "[SUCC] ${n}/${RETRIES}"; + return 0; + fi; + sleep ${PAUSE}; + echo "[FAIL] ${n}/${RETRIES}"; + done; + return 1; + } + retry make _pull-base-image VERSION=${VERSION} ARCH=linux/arm64 + retry make build-base VERSION=${VERSION} ARCH=linux/arm64 + env: + VERSION: ${{ matrix.version }} + RETRIES: 20 + PAUSE: 10 + + - name: Test Base + run: | + retry() { + for n in $(seq ${RETRIES}); do + echo "[${n}/${RETRIES}] ${*}"; + if eval "${*}"; then + echo "[SUCC] ${n}/${RETRIES}"; + return 0; + fi; + sleep ${PAUSE}; + echo "[FAIL] ${n}/${RETRIES}"; + done; + return 1; + } + #retry make test-base VERSION=${VERSION} ARCH=linux/arm64 + env: + VERSION: ${{ matrix.version }} + RETRIES: 20 + PAUSE: 10 + + + # ------------------------------------------------------------ + # Mods + # ------------------------------------------------------------ + - name: Build Mods + run: | + retry() { + for n in $(seq ${RETRIES}); do + echo "[${n}/${RETRIES}] ${*}"; + if eval "${*}"; then + echo "[SUCC] ${n}/${RETRIES}"; + return 0; + fi; + sleep ${PAUSE}; + echo "[FAIL] ${n}/${RETRIES}"; + done; + return 1; + } + retry make build-mods VERSION=${VERSION} ARCH=linux/arm64 + env: + VERSION: ${{ matrix.version }} + RETRIES: 20 + PAUSE: 10 + + - name: Test Mods + run: | + retry() { + for n in $(seq ${RETRIES}); do + echo "[${n}/${RETRIES}] ${*}"; + if eval "${*}"; then + echo "[SUCC] ${n}/${RETRIES}"; + return 0; + fi; + sleep ${PAUSE}; + echo "[FAIL] ${n}/${RETRIES}"; + done; + return 1; + } + #retry make test-mods VERSION=${VERSION} ARCH=linux/arm64 + env: + VERSION: ${{ matrix.version }} + RETRIES: 20 + PAUSE: 10 + + + # ------------------------------------------------------------ + # Prod + # ------------------------------------------------------------ + - name: Build Prod + run: | + retry() { + for n in $(seq ${RETRIES}); do + echo "[${n}/${RETRIES}] ${*}"; + if eval "${*}"; then + echo "[SUCC] ${n}/${RETRIES}"; + return 0; + fi; + sleep ${PAUSE}; + echo "[FAIL] ${n}/${RETRIES}"; + done; + return 1; + } + retry make build-prod VERSION=${VERSION} ARCH=linux/arm64 + env: + VERSION: ${{ matrix.version }} + RETRIES: 20 + PAUSE: 10 + + - name: Test Prod + run: | + retry() { + for n in $(seq ${RETRIES}); do + echo "[${n}/${RETRIES}] ${*}"; + if eval "${*}"; then + echo "[SUCC] ${n}/${RETRIES}"; + return 0; + fi; + sleep ${PAUSE}; + echo "[FAIL] ${n}/${RETRIES}"; + done; + return 1; + } + #retry make test-prod VERSION=${VERSION} + env: + VERSION: ${{ matrix.version }} + RETRIES: 20 + PAUSE: 10 + + + # ------------------------------------------------------------ + # Work + # ------------------------------------------------------------ + - name: Build Work + run: | + retry() { + for n in $(seq ${RETRIES}); do + echo "[${n}/${RETRIES}] ${*}"; + if eval "${*}"; then + echo "[SUCC] ${n}/${RETRIES}"; + return 0; + fi; + sleep ${PAUSE}; + echo "[FAIL] ${n}/${RETRIES}"; + done; + return 1; + } + retry make build-work VERSION=${VERSION} ARCH=linux/arm64 + env: + VERSION: ${{ matrix.version }} + RETRIES: 20 + PAUSE: 10 + + - name: Test Work + run: | + retry() { + for n in $(seq ${RETRIES}); do + echo "[${n}/${RETRIES}] ${*}"; + if eval "${*}"; then + echo "[SUCC] ${n}/${RETRIES}"; + return 0; + fi; + sleep ${PAUSE}; + echo "[FAIL] ${n}/${RETRIES}"; + done; + return 1; + } + #retry make test-work VERSION=${VERSION} + env: + VERSION: ${{ matrix.version }} + RETRIES: 20 + PAUSE: 10 + + + # ------------------------------------------------------------ + # Diff README.md + # ------------------------------------------------------------ + - name: Diff README.md + run: | + make gen-readme VERSION=${VERSION} + git diff --quiet || { echo "Build Changes"; git diff; git status; false; } + env: + VERSION: ${{ matrix.version }} + + + # ------------------------------------------------------------ + # Deploy + # ------------------------------------------------------------ + #- name: Publish images (only repo owner) + # run: | + # retry() { + # for n in $(seq ${RETRIES}); do + # echo "[${n}/${RETRIES}] ${*}"; + # if eval "${*}"; then + # echo "[SUCC] ${n}/${RETRIES}"; + # return 0; + # fi; + # sleep ${PAUSE}; + # echo "[FAIL] ${n}/${RETRIES}"; + # done; + # return 1; + # } + + # # Output + # echo "GIT_TYPE=${GIT_TYPE}" + # echo "GIT_SLUG=${GIT_SLUG}" + # echo "DOCKER_TAG_BASE=${DOCKER_TAG_BASE}" + # echo "DOCKER_TAG_MODS=${DOCKER_TAG_MODS}" + # echo "DOCKER_TAG_PROD=${DOCKER_TAG_PROD}" + # echo "DOCKER_TAG_WORK=${DOCKER_TAG_WORK}" + + # # Tag image + # retry make tag OLD_TAG="${VERSION}-base" NEW_TAG="${DOCKER_TAG_BASE}" + # retry make tag OLD_TAG="${VERSION}-mods" NEW_TAG="${DOCKER_TAG_MODS}" + # retry make tag OLD_TAG="${VERSION}-prod" NEW_TAG="${DOCKER_TAG_PROD}" + # retry make tag OLD_TAG="${VERSION}-work" NEW_TAG="${DOCKER_TAG_WORK}" + # docker images + + # # Login + # retry make login USERNAME=${{ secrets.DOCKERHUB_USERNAME }} PASSWORD=${{ secrets.DOCKERHUB_PASSWORD }} + + # # Push + # retry make push TAG=${DOCKER_TAG_BASE} + # retry make push TAG=${DOCKER_TAG_MODS} + # retry make push TAG=${DOCKER_TAG_PROD} + # retry make push TAG=${DOCKER_TAG_WORK} + # env: + # VERSION: ${{ matrix.version }} + # RETRIES: 20 + # PAUSE: 10 + # # https://help.github.com/en/github/automating-your-workflow-with-github-actions/contexts-and-expression-syntax-for-github-actions#functions + # if: github.event.pull_request.base.repo.id == github.event.pull_request.head.repo.id + # && ( + # (github.event_name == 'schedule' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/'))) + # || + # (github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/'))) + # || + # (github.event_name == 'push' && startsWith(github.ref, 'refs/heads/release-')) + # ) From e33041ca556177855e1129379c205a00bba2334f Mon Sep 17 00:00:00 2001 From: cytopia Date: Fri, 18 Mar 2022 12:59:38 +0100 Subject: [PATCH 06/19] Switch PHP 5.5 base image to devilbox/php-fpm-5.5 for arm64 support --- CHANGELOG.md | 1 + Dockerfiles/base/Dockerfile-5.5 | 2 +- build/ansible/DOCKERFILES/Dockerfile-base.j2 | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3df53d6a..8f0d5ee4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ #### Changed - Removed `amqp` on PHP 5.3 +- Switch PHP 5.5 base image to [devilbox/php-fpm-5.5](https://github.com/devilbox/docker-php-fpm-5.5) for arm64 support ## Release 0.135 diff --git a/Dockerfiles/base/Dockerfile-5.5 b/Dockerfiles/base/Dockerfile-5.5 index 116e8417..1e062813 100644 --- a/Dockerfiles/base/Dockerfile-5.5 +++ b/Dockerfiles/base/Dockerfile-5.5 @@ -1,5 +1,5 @@ # Auto-generated via Ansible: edit build/ansible/DOCKERFILES/Dockerfile-base.j2 instead. -FROM php:5.5-fpm +FROM devilbox/php-fpm-5.5 MAINTAINER "cytopia" diff --git a/build/ansible/DOCKERFILES/Dockerfile-base.j2 b/build/ansible/DOCKERFILES/Dockerfile-base.j2 index b29da3cc..5f60cf88 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-base.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-base.j2 @@ -3,6 +3,8 @@ FROM devilbox/php-fpm-5.2 {% elif php_version == 5.3 %} FROM devilbox/php-fpm-5.3 +{% elif php_version == 5.5 %} +FROM devilbox/php-fpm-5.5 {% elif php_version == 8.0 %} FROM devilbox/php-fpm-8.0 {% elif php_version == 8.1 %} From 116aa387fbcd4e361b4595cd3aaa69194c5d7e0f Mon Sep 17 00:00:00 2001 From: cytopia Date: Fri, 18 Mar 2022 13:35:03 +0100 Subject: [PATCH 07/19] Changed PHP 5.5 to Debian stretch --- Dockerfiles/base/Dockerfile-5.5 | 7 ------- Dockerfiles/mods/Dockerfile-5.5 | 22 +++++++++++--------- Dockerfiles/work/Dockerfile-5.5 | 15 ++++++------- build/ansible/DOCKERFILES/Dockerfile-base.j2 | 2 +- build/ansible/DOCKERFILES/Dockerfile-work.j2 | 2 +- build/ansible/group_vars/all/mods.yml | 12 +++-------- build/ansible/group_vars/all/work.yml | 18 ++-------------- 7 files changed, 27 insertions(+), 51 deletions(-) diff --git a/Dockerfiles/base/Dockerfile-5.5 b/Dockerfiles/base/Dockerfile-5.5 index 1e062813..bd8d591e 100644 --- a/Dockerfiles/base/Dockerfile-5.5 +++ b/Dockerfiles/base/Dockerfile-5.5 @@ -43,13 +43,6 @@ RUN set -eux \ ### ### Upgrade (install ps) ### -RUN set -eux \ - && rm -f /etc/apt/sources.list \ - && { \ - echo "deb http://ftp.debian.org/debian jessie main"; \ - echo "#deb http://ftp.debian.org/debian jessie-updates main"; \ - echo "deb http://security.debian.org/debian-security jessie/updates main"; \ - } | tee /etc/apt/sources.list RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -q \ && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ diff --git a/Dockerfiles/mods/Dockerfile-5.5 b/Dockerfiles/mods/Dockerfile-5.5 index f6c083c3..92241715 100644 --- a/Dockerfiles/mods/Dockerfile-5.5 +++ b/Dockerfiles/mods/Dockerfile-5.5 @@ -43,7 +43,8 @@ RUN set -eux \ libssl-dev \ libtidy-dev \ libvpx-dev \ - libwebp5 \ + libwebp-dev \ + libwebp6 \ libxml2-dev \ libxpm-dev \ libxslt-dev \ @@ -744,22 +745,23 @@ RUN set -eux \ libenchant1c2a \ libfbclient2 \ libfreetype6 \ - libicu52 \ + libicu57 \ libjpeg62-turbo \ - libmagickwand-6.q16-2 \ + libmagickwand-6.q16-6 \ + libmariadbclient18 \ libmcrypt4 \ libmemcachedutil2 \ - libmysqlclient18 \ - libnghttp2-5 \ - libpng12-0 \ + libnghttp2-14 \ + libpng16-16 \ libpq5 \ - librabbitmq1 \ + librabbitmq4 \ librdkafka1 \ librecode0 \ libsybdb5 \ - libtidy-0.99-0 \ - libvpx1 \ - libwebp5 \ + libtidy5 \ + libvpx4 \ + libwebp-dev \ + libwebp6 \ libxpm4 \ libxslt1.1 \ libyaml-0-2 \ diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index 6bee2802..b7da7ff9 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -55,16 +55,16 @@ RUN set -eux \ dirmngr \ gnupg \ \ - && echo 'Acquire::Check-Valid-Until no;' > /etc/apt/apt.conf.d/99no-check-valid-until \ - && echo "deb http://archive.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \ + && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138 \ + && echo "deb http://ftp.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/backports.list \ && curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \ && echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \ && APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \ && echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \ - && APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \ - && echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main" > /etc/apt/sources.list.d/mongo.list \ + && APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 9DA31620334BD75D9DCB49F368818C72E52529D4 \ + && echo "deb http://repo.mongodb.org/apt/debian stretch/mongodb-org/4.0 main" > /etc/apt/sources.list.d/mongo.list \ && curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \ - && echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \ + && echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" > /etc/apt/sources.list.d/pgsql.list \ && curl -sS -k -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \ && echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \ \ @@ -79,6 +79,7 @@ RUN set -eux \ blackfire-agent \ build-essential \ bzip2 \ + certbot \ coreutils \ dnsutils \ dos2unix \ @@ -353,10 +354,10 @@ RUN set -eux \ && chmod +x /usr/local/bin/symfony \ \ # -------------------- wkhtmltopdf -------------------- - && VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )" \ + && VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )" \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ - libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \ + libfontenc1 libxfont2 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \ && curl -sS -L --fail -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \ && dpkg -i /tmp/wkhtmltopdf.deb \ && rm -f /tmp/wkhtmltopdf.deb \ diff --git a/build/ansible/DOCKERFILES/Dockerfile-base.j2 b/build/ansible/DOCKERFILES/Dockerfile-base.j2 index 5f60cf88..0b161852 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-base.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-base.j2 @@ -57,7 +57,7 @@ RUN set -eux \ ### ### Upgrade (install ps) ### -{% if php_version in [5.4, 5.5] %} +{% if php_version in [5.4] %} RUN set -eux \ && rm -f /etc/apt/sources.list \ && { \ diff --git a/build/ansible/DOCKERFILES/Dockerfile-work.j2 b/build/ansible/DOCKERFILES/Dockerfile-work.j2 index 375e6b8a..77a485cf 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-work.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-work.j2 @@ -92,7 +92,7 @@ RUN set -eux \ blackfire-agent \ build-essential \ bzip2 \ -{% if php_version != 5.4 and php_version != 5.5 %} +{% if php_version != 5.4 %} certbot \ {% endif %} coreutils \ diff --git a/build/ansible/group_vars/all/mods.yml b/build/ansible/group_vars/all/mods.yml index 85c00389..577e9f6c 100644 --- a/build/ansible/group_vars/all/mods.yml +++ b/build/ansible/group_vars/all/mods.yml @@ -161,7 +161,6 @@ extensions_available: 5.5: type: pecl version: 1.9.3 - run_dep: [librabbitmq1] all: type: pecl command: echo "/usr" | pecl install amqp @@ -297,8 +296,7 @@ extensions_available: type: builtin pre: ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/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-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] + run_dep: [libpng16-16, libjpeg62-turbo, libxpm4, libvpx4, libfreetype6, libwebp6] 5.6: type: builtin pre: ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libXpm.* /usr/lib/ @@ -377,8 +375,6 @@ extensions_available: disabled: [5.2, 5.3, 5.4] # Only available since 5.3. 5.3 and 5.4 segfaults 5.5: type: pecl - build_dep: [libmagickwand-dev, libwebp5, ghostscript] - run_dep: [libmagickwand-6.q16-2, libwebp5, ghostscript] 5.6: type: pecl run_dep: [libmagickwand-6.q16-3, libwebp6, ghostscript] @@ -427,7 +423,7 @@ extensions_available: run_dep: [libicu52] 5.5: type: builtin - run_dep: [libicu52] + run_dep: [libicu57] 5.6: type: builtin run_dep: [libicu57] @@ -654,7 +650,6 @@ extensions_available: run_dep: [libmysqlclient18] 5.5: type: builtin - run_dep: [libmysqlclient18] all: type: builtin run_dep: [libmariadbclient18] @@ -1111,7 +1106,6 @@ extensions_available: 5.5: type: pecl version: 1.9.23 - run_dep: [libnghttp2-5] 5.6: type: pecl version: 1.9.23 @@ -1147,7 +1141,7 @@ extensions_available: run_dep: [libtidy-0.99-0] 5.5: type: builtin - run_dep: [libtidy-0.99-0] + run_dep: [libtidy5] 5.6: type: builtin run_dep: [libtidy5] diff --git a/build/ansible/group_vars/all/work.yml b/build/ansible/group_vars/all/work.yml index 743a8ee9..7f67662a 100644 --- a/build/ansible/group_vars/all/work.yml +++ b/build/ansible/group_vars/all/work.yml @@ -131,9 +131,6 @@ apt_repositories_available: 5.4: pre: echo 'Acquire::Check-Valid-Until no;' > /etc/apt/apt.conf.d/99no-check-valid-until deb: deb http://archive.debian.org/debian jessie-backports main - 5.5: - pre: echo 'Acquire::Check-Valid-Until no;' > /etc/apt/apt.conf.d/99no-check-valid-until - deb: deb http://archive.debian.org/debian jessie-backports main all: pre: apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138 deb: deb http://ftp.debian.org/debian stretch-backports main @@ -163,9 +160,6 @@ apt_repositories_available: 5.4: deb: deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main key: 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 - 5.5: - deb: deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main - key: 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 all: deb: deb http://repo.mongodb.org/apt/debian stretch/mongodb-org/4.0 main key: 9DA31620334BD75D9DCB49F368818C72E52529D4 @@ -179,7 +173,8 @@ apt_repositories_available: 5.4: deb: deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main 5.5: - deb: deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main + deb: deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main + pre: curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - 5.6: deb: deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main pre: curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - @@ -946,15 +941,6 @@ software_available: && curl -sS -L --fail -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \ && dpkg -i /tmp/wkhtmltopdf.deb \ && rm -f /tmp/wkhtmltopdf.deb \ - 5.5: - pre: VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )" - command: | - DEBIAN_FRONTEND=noninteractive apt-get update -qq \ - && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ - libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \ - && curl -sS -L --fail -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \ - && dpkg -i /tmp/wkhtmltopdf.deb \ - && rm -f /tmp/wkhtmltopdf.deb \ 5.6: command: | DEBIAN_FRONTEND=noninteractive apt-get update -qq \ From 157945dadabb4292c24e3e783747ab79b56be5d7 Mon Sep 17 00:00:00 2001 From: cytopia Date: Fri, 18 Mar 2022 18:41:13 +0100 Subject: [PATCH 08/19] Fix syntax error --- CHANGELOG.md | 1 + Dockerfiles/work/Dockerfile-5.2 | 2 +- Dockerfiles/work/Dockerfile-5.3 | 2 +- Dockerfiles/work/Dockerfile-5.4 | 2 +- Dockerfiles/work/Dockerfile-5.5 | 2 +- Dockerfiles/work/Dockerfile-5.6 | 2 +- Dockerfiles/work/Dockerfile-7.0 | 2 +- Dockerfiles/work/Dockerfile-7.1 | 2 +- Dockerfiles/work/Dockerfile-7.2 | 2 +- Dockerfiles/work/Dockerfile-7.3 | 2 +- Dockerfiles/work/Dockerfile-7.4 | 2 +- Dockerfiles/work/Dockerfile-8.0 | 2 +- Dockerfiles/work/Dockerfile-8.1 | 2 +- Dockerfiles/work/Dockerfile-8.2 | 2 +- build/ansible/DOCKERFILES/Dockerfile-work.j2 | 2 +- 15 files changed, 15 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f0d5ee4..8ddac9c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ #### Changed - Removed `amqp` on PHP 5.3 - Switch PHP 5.5 base image to [devilbox/php-fpm-5.5](https://github.com/devilbox/docker-php-fpm-5.5) for arm64 support +- Changed PHP 5.5 to Debian stretch ## Release 0.135 diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2 index 255c3083..d7fb485b 100644 --- a/Dockerfiles/work/Dockerfile-5.2 +++ b/Dockerfiles/work/Dockerfile-5.2 @@ -148,7 +148,7 @@ RUN set -eux \ ### Instal Architecture Dependent software ### RUN set -eux \ - && if [ "${ARCH}" = "linux/amd64" ]; \ + && if [ "${ARCH}" = "linux/amd64" ]; then \ DEBIAN_FRONTEND=noninteractive apt-get update -q \ && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ mongodb-org-shell \ diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3 index d3e119df..d817cba2 100644 --- a/Dockerfiles/work/Dockerfile-5.3 +++ b/Dockerfiles/work/Dockerfile-5.3 @@ -148,7 +148,7 @@ RUN set -eux \ ### Instal Architecture Dependent software ### RUN set -eux \ - && if [ "${ARCH}" = "linux/amd64" ]; \ + && if [ "${ARCH}" = "linux/amd64" ]; then \ DEBIAN_FRONTEND=noninteractive apt-get update -q \ && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ mongodb-org-shell \ diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index f9322d76..824f8053 100644 --- a/Dockerfiles/work/Dockerfile-5.4 +++ b/Dockerfiles/work/Dockerfile-5.4 @@ -147,7 +147,7 @@ RUN set -eux \ ### Instal Architecture Dependent software ### RUN set -eux \ - && if [ "${ARCH}" = "linux/amd64" ]; \ + && if [ "${ARCH}" = "linux/amd64" ]; then \ DEBIAN_FRONTEND=noninteractive apt-get update -q \ && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ mongodb-org-shell \ diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index b7da7ff9..59622db1 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -148,7 +148,7 @@ RUN set -eux \ ### Instal Architecture Dependent software ### RUN set -eux \ - && if [ "${ARCH}" = "linux/amd64" ]; \ + && if [ "${ARCH}" = "linux/amd64" ]; then \ DEBIAN_FRONTEND=noninteractive apt-get update -q \ && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ mongodb-org-shell \ diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index 07c5cc4e..c97235d8 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -149,7 +149,7 @@ RUN set -eux \ ### Instal Architecture Dependent software ### RUN set -eux \ - && if [ "${ARCH}" = "linux/amd64" ]; \ + && if [ "${ARCH}" = "linux/amd64" ]; then \ DEBIAN_FRONTEND=noninteractive apt-get update -q \ && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ mongodb-org-shell \ diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index 264ec2b5..0e7230d2 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -149,7 +149,7 @@ RUN set -eux \ ### Instal Architecture Dependent software ### RUN set -eux \ - && if [ "${ARCH}" = "linux/amd64" ]; \ + && if [ "${ARCH}" = "linux/amd64" ]; then \ DEBIAN_FRONTEND=noninteractive apt-get update -q \ && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ mongodb-org-shell \ diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index 59e0994e..2acb359a 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -148,7 +148,7 @@ RUN set -eux \ ### Instal Architecture Dependent software ### RUN set -eux \ - && if [ "${ARCH}" = "linux/amd64" ]; \ + && if [ "${ARCH}" = "linux/amd64" ]; then \ DEBIAN_FRONTEND=noninteractive apt-get update -q \ && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ mongodb-org-shell \ diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index 692217a3..7f8148d2 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -148,7 +148,7 @@ RUN set -eux \ ### Instal Architecture Dependent software ### RUN set -eux \ - && if [ "${ARCH}" = "linux/amd64" ]; \ + && if [ "${ARCH}" = "linux/amd64" ]; then \ DEBIAN_FRONTEND=noninteractive apt-get update -q \ && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ mongodb-org-shell \ diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index 95527376..836a9aa9 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -148,7 +148,7 @@ RUN set -eux \ ### Instal Architecture Dependent software ### RUN set -eux \ - && if [ "${ARCH}" = "linux/amd64" ]; \ + && if [ "${ARCH}" = "linux/amd64" ]; then \ DEBIAN_FRONTEND=noninteractive apt-get update -q \ && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ mongodb-org-shell \ diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4 index 190f2850..b7a21763 100644 --- a/Dockerfiles/work/Dockerfile-7.4 +++ b/Dockerfiles/work/Dockerfile-7.4 @@ -148,7 +148,7 @@ RUN set -eux \ ### Instal Architecture Dependent software ### RUN set -eux \ - && if [ "${ARCH}" = "linux/amd64" ]; \ + && if [ "${ARCH}" = "linux/amd64" ]; then \ DEBIAN_FRONTEND=noninteractive apt-get update -q \ && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ mongodb-org-shell \ diff --git a/Dockerfiles/work/Dockerfile-8.0 b/Dockerfiles/work/Dockerfile-8.0 index bd137f50..de38d97c 100644 --- a/Dockerfiles/work/Dockerfile-8.0 +++ b/Dockerfiles/work/Dockerfile-8.0 @@ -148,7 +148,7 @@ RUN set -eux \ ### Instal Architecture Dependent software ### RUN set -eux \ - && if [ "${ARCH}" = "linux/amd64" ]; \ + && if [ "${ARCH}" = "linux/amd64" ]; then \ DEBIAN_FRONTEND=noninteractive apt-get update -q \ && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ mongodb-org-shell \ diff --git a/Dockerfiles/work/Dockerfile-8.1 b/Dockerfiles/work/Dockerfile-8.1 index 2c8ef39e..02c96054 100644 --- a/Dockerfiles/work/Dockerfile-8.1 +++ b/Dockerfiles/work/Dockerfile-8.1 @@ -148,7 +148,7 @@ RUN set -eux \ ### Instal Architecture Dependent software ### RUN set -eux \ - && if [ "${ARCH}" = "linux/amd64" ]; \ + && if [ "${ARCH}" = "linux/amd64" ]; then \ DEBIAN_FRONTEND=noninteractive apt-get update -q \ && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ mongodb-org-shell \ diff --git a/Dockerfiles/work/Dockerfile-8.2 b/Dockerfiles/work/Dockerfile-8.2 index abcc8fe1..6cfc1016 100644 --- a/Dockerfiles/work/Dockerfile-8.2 +++ b/Dockerfiles/work/Dockerfile-8.2 @@ -148,7 +148,7 @@ RUN set -eux \ ### Instal Architecture Dependent software ### RUN set -eux \ - && if [ "${ARCH}" = "linux/amd64" ]; \ + && if [ "${ARCH}" = "linux/amd64" ]; then \ DEBIAN_FRONTEND=noninteractive apt-get update -q \ && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ mongodb-org-shell \ diff --git a/build/ansible/DOCKERFILES/Dockerfile-work.j2 b/build/ansible/DOCKERFILES/Dockerfile-work.j2 index 77a485cf..c7346517 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-work.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-work.j2 @@ -170,7 +170,7 @@ RUN set -eux \ ### Instal Architecture Dependent software ### RUN set -eux \ - && if [ "${ARCH}" = "linux/amd64" ]; \ + && if [ "${ARCH}" = "linux/amd64" ]; then \ DEBIAN_FRONTEND=noninteractive apt-get update -q \ && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ mongodb-org-shell \ From 80f03e7512b261fb5fac2791745b09475dc0820e Mon Sep 17 00:00:00 2001 From: cytopia Date: Sun, 20 Mar 2022 23:04:15 +0100 Subject: [PATCH 09/19] Integrate new PHP-FPM images --- CHANGELOG.md | 3 +- Dockerfiles/base/Dockerfile-5.4 | 9 +- Dockerfiles/mods/Dockerfile-5.2 | 103 +++++++++---- Dockerfiles/mods/Dockerfile-5.3 | 110 +++++++++---- Dockerfiles/mods/Dockerfile-5.4 | 133 +++++++++------- Dockerfiles/mods/Dockerfile-5.5 | 68 ++++++--- Dockerfiles/mods/Dockerfile-5.6 | 26 +++- Dockerfiles/mods/Dockerfile-7.0 | 25 ++- Dockerfiles/mods/Dockerfile-7.1 | 26 +++- Dockerfiles/mods/Dockerfile-7.2 | 26 +++- Dockerfiles/mods/Dockerfile-7.3 | 26 +++- Dockerfiles/mods/Dockerfile-7.4 | 30 +++- Dockerfiles/mods/Dockerfile-8.0 | 26 +++- Dockerfiles/mods/Dockerfile-8.1 | 26 +++- Dockerfiles/mods/Dockerfile-8.2 | 26 +++- Dockerfiles/work/Dockerfile-5.2 | 17 +-- Dockerfiles/work/Dockerfile-5.3 | 17 +-- Dockerfiles/work/Dockerfile-5.4 | 2 +- Dockerfiles/work/Dockerfile-5.5 | 17 +-- Dockerfiles/work/Dockerfile-5.6 | 2 +- Dockerfiles/work/Dockerfile-7.0 | 2 +- Dockerfiles/work/Dockerfile-7.1 | 2 +- Dockerfiles/work/Dockerfile-7.2 | 2 +- Dockerfiles/work/Dockerfile-7.3 | 2 +- Dockerfiles/work/Dockerfile-7.4 | 2 +- Dockerfiles/work/Dockerfile-8.0 | 2 +- Dockerfiles/work/Dockerfile-8.1 | 2 +- Dockerfiles/work/Dockerfile-8.2 | 2 +- build/ansible/DOCKERFILES/Dockerfile-base.j2 | 11 +- build/ansible/DOCKERFILES/Dockerfile-mods.j2 | 29 +++- build/ansible/DOCKERFILES/Dockerfile-work.j2 | 4 +- build/ansible/group_vars/all/mods.yml | 153 +++++++++++++------ build/ansible/group_vars/all/work.yml | 54 ++++++- 33 files changed, 702 insertions(+), 283 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ddac9c7..889ad89a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,9 +10,8 @@ - Fixed `mongodb-org-shell` and `mongodb-org-tools` install #### Changed -- Removed `amqp` on PHP 5.3 +- Switch PHP 5.4 base image to [devilbox/php-fpm-5.4](https://github.com/devilbox/docker-php-fpm-5.4) for arm64 support - Switch PHP 5.5 base image to [devilbox/php-fpm-5.5](https://github.com/devilbox/docker-php-fpm-5.5) for arm64 support -- Changed PHP 5.5 to Debian stretch ## Release 0.135 diff --git a/Dockerfiles/base/Dockerfile-5.4 b/Dockerfiles/base/Dockerfile-5.4 index a36d13b9..66fc157b 100644 --- a/Dockerfiles/base/Dockerfile-5.4 +++ b/Dockerfiles/base/Dockerfile-5.4 @@ -1,5 +1,5 @@ # Auto-generated via Ansible: edit build/ansible/DOCKERFILES/Dockerfile-base.j2 instead. -FROM php:5.4-fpm +FROM devilbox/php-fpm-5.4 MAINTAINER "cytopia" @@ -43,13 +43,6 @@ RUN set -eux \ ### ### Upgrade (install ps) ### -RUN set -eux \ - && rm -f /etc/apt/sources.list \ - && { \ - echo "deb http://ftp.debian.org/debian jessie main"; \ - echo "#deb http://ftp.debian.org/debian jessie-updates main"; \ - echo "deb http://security.debian.org/debian-security jessie/updates main"; \ - } | tee /etc/apt/sources.list RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -q \ && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ diff --git a/Dockerfiles/mods/Dockerfile-5.2 b/Dockerfiles/mods/Dockerfile-5.2 index b045dc73..3081a6e0 100644 --- a/Dockerfiles/mods/Dockerfile-5.2 +++ b/Dockerfiles/mods/Dockerfile-5.2 @@ -26,12 +26,12 @@ RUN set -eux \ libmagic-dev \ libmcrypt-dev \ libmemcached-dev \ + libmysqlclient-dev \ libpcre3-dev \ libpng-dev \ libpq-dev \ libpspell-dev \ librabbitmq-dev \ - librecode-dev \ libsasl2-dev \ libsnmp-dev \ libssl-dev \ @@ -43,8 +43,28 @@ RUN set -eux \ libxslt-dev \ snmp \ zlib1g-dev \ +# Build tools + autoconf \ + bison \ + bisonc++ \ ca-certificates \ - git + curl \ + dpkg-dev \ + file \ + flex \ + g++ \ + gcc \ + git \ + lemon \ + libc-client-dev \ + libc-dev \ + libcurl4-openssl-dev \ + libssl-dev \ + make \ + patch \ + pkg-config \ + re2c \ + xz-utils # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr) @@ -134,22 +154,14 @@ RUN set -eux \ && true -# -------------------- Installing PHP Extension: ftp -------------------- -RUN set -eux \ - # Installation: Generic - # Type: Built-in extension - # Custom: configure command - && docker-php-ext-configure ftp --with-openssl-dir \ - && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) ftp \ - && true - - # -------------------- Installing PHP Extension: gd -------------------- RUN set -eux \ # Version specific pre-command && ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libjpeg.* /usr/lib/ && \ ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libpng.* /usr/lib/ && \ -ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libXpm.* /usr/lib/ \ +ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libXpm.* /usr/lib/ && \ +mkdir /usr/include/freetype2/freetype && \ +ln -s /usr/include/freetype2/freetype.h /usr/include/freetype2/freetype/freetype.h \ \ # Installation: Version specific # Type: Built-in extension @@ -275,6 +287,26 @@ RUN set -eux \ && true +# -------------------- Installing PHP Extension: mysql -------------------- +RUN set -eux \ + # Installation: Version specific + # Type: Built-in extension + # Default: configure command + && docker-php-ext-configure mysql --with-mysql --with-mysql-sock --with-zlib-dir=/usr --with-libdir="/lib/$(dpkg-architecture --query DEB_BUILD_MULTIARCH)" \ + # Installation + && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysql \ + && true + + +# -------------------- Installing PHP Extension: mysqli -------------------- +RUN set -eux \ + # Installation: Version specific + # Type: Built-in extension + # Installation + && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysqli \ + && true + + # -------------------- Installing PHP Extension: oauth -------------------- RUN set -eux \ # Installation: Version specific @@ -323,6 +355,17 @@ RUN set -eux \ && true +# -------------------- Installing PHP Extension: pdo_mysql -------------------- +RUN set -eux \ + # Installation: Version specific + # Type: Built-in extension + # Default: configure command + && docker-php-ext-configure pdo_mysql --with-zlib-dir=/usr \ + # Installation + && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_mysql \ + && true + + # -------------------- Installing PHP Extension: pdo_pgsql -------------------- RUN set -eux \ # Installation: Generic @@ -358,14 +401,6 @@ RUN set -eux \ && true -# -------------------- Installing PHP Extension: recode -------------------- -RUN set -eux \ - # Installation: Generic - # Type: Built-in extension - && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \ - && true - - # -------------------- Installing PHP Extension: redis -------------------- RUN set -eux \ # Installation: Version specific @@ -395,6 +430,16 @@ RUN set -eux \ && true +# -------------------- Installing PHP Extension: soap -------------------- +RUN set -eux \ + # Installation: Generic + # Type: Built-in extension + # Custom: configure command + && docker-php-ext-configure soap --with-libxml-dir=/usr \ + && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) soap \ + && true + + # -------------------- Installing PHP Extension: sockets -------------------- RUN set -eux \ # Installation: Generic @@ -560,22 +605,24 @@ RUN set -eux \ libenchant1c2a \ libfbclient2 \ libfreetype6 \ - libicu57 \ + libicu52 \ libjpeg62-turbo \ - libmariadbclient18 \ + libmagic1 \ libmcrypt4 \ libmemcachedutil2 \ - libpng16-16 \ + libmysqlclient18 \ + libpng12-0 \ libpq5 \ - librabbitmq4 \ + librabbitmq1 \ librecode0 \ libsybdb5 \ - libtidy5 \ - libvpx4 \ - libwebp6 \ + libtidy-0.99-0 \ + libvpx1 \ + libwebp5 \ libxpm4 \ libxslt1.1 \ snmp \ + zlib1g \ ca-certificates \ && rm -rf /var/lib/apt/lists/* \ \ diff --git a/Dockerfiles/mods/Dockerfile-5.3 b/Dockerfiles/mods/Dockerfile-5.3 index 5b6a13f2..5de4a6f7 100644 --- a/Dockerfiles/mods/Dockerfile-5.3 +++ b/Dockerfiles/mods/Dockerfile-5.3 @@ -28,11 +28,13 @@ RUN set -eux \ libldap2-dev \ libmcrypt-dev \ libmemcached-dev \ + libmysqlclient-dev \ libnghttp2-dev \ libpcre3-dev \ libpng-dev \ libpq-dev \ libpspell-dev \ + librabbitmq-dev \ librdkafka-dev \ libsasl2-dev \ libsnmp-dev \ @@ -47,8 +49,28 @@ RUN set -eux \ snmp \ uuid-dev \ zlib1g-dev \ +# Build tools + autoconf \ + bison \ + bisonc++ \ ca-certificates \ - git + curl \ + dpkg-dev \ + file \ + flex \ + g++ \ + gcc \ + git \ + lemon \ + libc-client-dev \ + libc-dev \ + libcurl4-openssl-dev \ + libssl-dev \ + make \ + patch \ + pkg-config \ + re2c \ + xz-utils # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr) @@ -65,6 +87,17 @@ RUN set -eux \ echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \ fi +# -------------------- Installing PHP Extension: amqp -------------------- +RUN set -eux \ + # Installation: Version specific + # Type: PECL extension + # Default: Pecl command + && pecl install amqp-1.9.3 \ + # Enabling + && docker-php-ext-enable amqp \ + && true + + # -------------------- Installing PHP Extension: apcu -------------------- RUN set -eux \ # Installation: Version specific @@ -124,20 +157,15 @@ RUN set -eux \ && true -# -------------------- Installing PHP Extension: ftp -------------------- -RUN set -eux \ - # Installation: Generic - # Type: Built-in extension - # Custom: configure command - && docker-php-ext-configure ftp --with-openssl-dir \ - && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) ftp \ - && true - - # -------------------- Installing PHP Extension: gd -------------------- RUN set -eux \ # Version specific pre-command - && ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libXpm.* /usr/lib/ \ + && ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libjpeg.* /usr/lib/ && \ +ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libpng.* /usr/lib/ && \ +ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libXpm.* /usr/lib/ && \ +mkdir /usr/include/freetype2/freetype && \ +ln -s /usr/include/freetype2/freetype.h /usr/include/freetype2/freetype/freetype.h \ + \ # Installation: Version specific # Type: Built-in extension # Custom: configure command @@ -217,14 +245,6 @@ RUN set -eux \ && true -# -------------------- Installing PHP Extension: mbstring -------------------- -RUN set -eux \ - # Installation: Generic - # Type: Built-in extension - && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mbstring \ - && true - - # -------------------- Installing PHP Extension: mcrypt -------------------- RUN set -eux \ # Installation: Version specific @@ -278,10 +298,33 @@ RUN set -eux \ && true +# -------------------- Installing PHP Extension: mongodb -------------------- +RUN set -eux \ + # Installation: Version specific + # Type: PECL extension + # Default: Pecl command + && pecl install mongodb-0.6.3 \ + # Enabling + && docker-php-ext-enable mongodb \ + && true + + +# -------------------- Installing PHP Extension: mysql -------------------- +RUN set -eux \ + # Installation: Version specific + # Type: Built-in extension + # Default: configure command + && docker-php-ext-configure mysql --with-mysql --with-mysql-sock --with-zlib-dir=/usr --with-libdir="/lib/$(dpkg-architecture --query DEB_BUILD_MULTIARCH)" \ + # Installation + && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysql \ + && true + + # -------------------- Installing PHP Extension: mysqli -------------------- RUN set -eux \ - # Installation: Generic + # Installation: Version specific # Type: Built-in extension + # Installation && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysqli \ && true @@ -375,10 +418,11 @@ RUN set -eux \ # -------------------- Installing PHP Extension: pdo_mysql -------------------- RUN set -eux \ - # Installation: Generic + # Installation: Version specific # Type: Built-in extension - # Custom: configure command + # Default: configure command && docker-php-ext-configure pdo_mysql --with-zlib-dir=/usr \ + # Installation && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_mysql \ && true @@ -671,25 +715,27 @@ RUN set -eux \ libenchant1c2a \ libfbclient2 \ libfreetype6 \ - libicu57 \ + libicu52 \ libjpeg62-turbo \ - libmariadbclient18 \ libmcrypt4 \ libmemcachedutil2 \ - libnghttp2-14 \ - libpng16-16 \ + libmysqlclient18 \ + libnghttp2-5 \ + libpng12-0 \ libpq5 \ + librabbitmq1 \ librdkafka1 \ librecode0 \ libsybdb5 \ - libtidy5 \ - libvpx4 \ - libwebp6 \ + libtidy-0.99-0 \ + libvpx1 \ + libwebp5 \ libxpm4 \ libxslt1.1 \ libyaml-0-2 \ snmp \ uuid \ + zlib1g \ ca-certificates \ && rm -rf /var/lib/apt/lists/* \ \ @@ -728,6 +774,8 @@ RUN set -eux \ && 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$' \ && php-fpm -m | grep -oiE '^apcu$' \ && php -m | grep -oiE '^bcmath$' \ @@ -790,6 +838,8 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^memcached$' \ && php -m | grep -oiE '^mongo$' \ && php-fpm -m | grep -oiE '^mongo$' \ + && php -m | grep -oiE '^mongodb$' \ + && php-fpm -m | grep -oiE '^mongodb$' \ && php -m | grep -oiE '^mysql$' \ && php-fpm -m | grep -oiE '^mysql$' \ && php -m | grep -oiE '^mysqli$' \ diff --git a/Dockerfiles/mods/Dockerfile-5.4 b/Dockerfiles/mods/Dockerfile-5.4 index f761b12f..d6b078dd 100644 --- a/Dockerfiles/mods/Dockerfile-5.4 +++ b/Dockerfiles/mods/Dockerfile-5.4 @@ -28,6 +28,7 @@ RUN set -eux \ libldap2-dev \ libmcrypt-dev \ libmemcached-dev \ + libmysqlclient-dev \ libnghttp2-dev \ libpcre3-dev \ libpng-dev \ @@ -40,6 +41,7 @@ RUN set -eux \ libssl-dev \ libtidy-dev \ libvpx-dev \ + libwebp-dev \ libxml2-dev \ libxpm-dev \ libxslt-dev \ @@ -47,8 +49,28 @@ RUN set -eux \ snmp \ uuid-dev \ zlib1g-dev \ +# Build tools + autoconf \ + bison \ + bisonc++ \ ca-certificates \ - git + curl \ + dpkg-dev \ + file \ + flex \ + g++ \ + gcc \ + git \ + lemon \ + libc-client-dev \ + libc-dev \ + libcurl4-openssl-dev \ + libssl-dev \ + make \ + patch \ + pkg-config \ + re2c \ + xz-utils # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr) @@ -91,7 +113,7 @@ RUN set -eux \ RUN set -eux \ # Installation: Generic # Type: Built-in extension - && docker-php-ext-install bcmath \ + && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) bcmath \ && true @@ -99,7 +121,7 @@ RUN set -eux \ RUN set -eux \ # Installation: Generic # Type: Built-in extension - && docker-php-ext-install bz2 \ + && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) bz2 \ && true @@ -107,7 +129,7 @@ RUN set -eux \ RUN set -eux \ # Installation: Generic # Type: Built-in extension - && docker-php-ext-install calendar \ + && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) calendar \ && true @@ -115,7 +137,7 @@ RUN set -eux \ RUN set -eux \ # Installation: Generic # Type: Built-in extension - && docker-php-ext-install dba \ + && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) dba \ && true @@ -123,7 +145,7 @@ RUN set -eux \ RUN set -eux \ # Installation: Generic # Type: Built-in extension - && docker-php-ext-install enchant \ + && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) enchant \ && true @@ -131,30 +153,25 @@ RUN set -eux \ RUN set -eux \ # Installation: Generic # Type: Built-in extension - && docker-php-ext-install exif \ - && true - - -# -------------------- Installing PHP Extension: ftp -------------------- -RUN set -eux \ - # Installation: Generic - # Type: Built-in extension - # Custom: configure command - && docker-php-ext-configure ftp --with-openssl-dir \ - && docker-php-ext-install ftp \ + && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) exif \ && true # -------------------- Installing PHP Extension: gd -------------------- RUN set -eux \ # Version specific pre-command - && ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libXpm.* /usr/lib/ \ + && ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libjpeg.* /usr/lib/ && \ +ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libpng.* /usr/lib/ && \ +ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libXpm.* /usr/lib/ && \ +mkdir /usr/include/freetype2/freetype && \ +ln -s /usr/include/freetype2/freetype.h /usr/include/freetype2/freetype/freetype.h \ + \ # Installation: Version specific # Type: Built-in extension # Custom: configure command && 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-native-ttf \ # Installation - && docker-php-ext-install gd \ + && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gd \ && true @@ -162,7 +179,7 @@ RUN set -eux \ RUN set -eux \ # Installation: Generic # Type: Built-in extension - && docker-php-ext-install gettext \ + && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gettext \ && true @@ -172,7 +189,7 @@ RUN set -eux \ && ln /usr/include/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/gmp.h /usr/include/ \ # Installation: Generic # Type: Built-in extension - && docker-php-ext-install gmp \ + && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gmp \ && true @@ -195,7 +212,7 @@ RUN set -eux \ # Type: Built-in extension # Custom: configure command && docker-php-ext-configure imap --with-kerberos --with-imap-ssl --with-imap \ - && docker-php-ext-install imap \ + && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) imap \ && true @@ -203,7 +220,7 @@ RUN set -eux \ RUN set -eux \ # Installation: Generic # Type: Built-in extension - && docker-php-ext-install interbase \ + && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) interbase \ && true @@ -212,7 +229,7 @@ RUN set -eux \ # Installation: Version specific # Type: Built-in extension # Installation - && docker-php-ext-install intl \ + && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) intl \ && true @@ -224,15 +241,7 @@ RUN set -eux \ # Type: Built-in extension # Custom: configure command && docker-php-ext-configure ldap --with-ldap --with-ldap-sasl \ - && docker-php-ext-install ldap \ - && true - - -# -------------------- Installing PHP Extension: mbstring -------------------- -RUN set -eux \ - # Installation: Generic - # Type: Built-in extension - && docker-php-ext-install mbstring \ + && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) ldap \ && true @@ -241,7 +250,7 @@ RUN set -eux \ # Installation: Version specific # Type: Built-in extension # Installation - && docker-php-ext-install mcrypt \ + && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mcrypt \ && true @@ -304,16 +313,19 @@ RUN set -eux \ RUN set -eux \ # Installation: Version specific # Type: Built-in extension + # Default: configure command + && docker-php-ext-configure mysql --with-mysql --with-mysql-sock --with-zlib-dir=/usr --with-libdir="/lib/$(dpkg-architecture --query DEB_BUILD_MULTIARCH)" \ # Installation - && docker-php-ext-install mysql \ + && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysql \ && true # -------------------- Installing PHP Extension: mysqli -------------------- RUN set -eux \ - # Installation: Generic + # Installation: Version specific # Type: Built-in extension - && docker-php-ext-install mysqli \ + # Installation + && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysqli \ && true @@ -357,7 +369,7 @@ https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architec # Type: Built-in extension # Custom: configure command && docker-php-ext-configure oci8 --with-oci8=instantclient,/usr/lib/oracle/${ORACLE_VERSION_MAJOR}/client64/lib/,${ORACLE_VERSION_MAJOR} \ - && docker-php-ext-install oci8 \ + && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) oci8 \ # Generic post-command && ORACLE_HREF="$( curl -sS https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/ | tac | tac | grep -Eo 'href="getPackage/oracle-instantclient.+basiclite.+rpm"' | tail -1 )" \ && ORACLE_VERSION_MAJOR="$( echo "${ORACLE_HREF}" | grep -Eo 'instantclient[.0-9]+' | sed 's/instantclient//g' )" \ @@ -382,7 +394,7 @@ RUN set -eux \ RUN set -eux \ # Installation: Generic # Type: Built-in extension - && docker-php-ext-install pcntl \ + && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pcntl \ && true @@ -392,7 +404,7 @@ RUN set -eux \ && ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libsybdb.* /usr/lib/ \ # Installation: Generic # Type: Built-in extension - && docker-php-ext-install pdo_dblib \ + && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_dblib \ && true @@ -400,17 +412,18 @@ RUN set -eux \ RUN set -eux \ # Installation: Generic # Type: Built-in extension - && docker-php-ext-install pdo_firebird \ + && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_firebird \ && true # -------------------- Installing PHP Extension: pdo_mysql -------------------- RUN set -eux \ - # Installation: Generic + # Installation: Version specific # Type: Built-in extension - # Custom: configure command + # Default: configure command && docker-php-ext-configure pdo_mysql --with-zlib-dir=/usr \ - && docker-php-ext-install pdo_mysql \ + # Installation + && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_mysql \ && true @@ -418,7 +431,7 @@ RUN set -eux \ RUN set -eux \ # Installation: Generic # Type: Built-in extension - && docker-php-ext-install pdo_pgsql \ + && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_pgsql \ && true @@ -426,7 +439,7 @@ RUN set -eux \ RUN set -eux \ # Installation: Generic # Type: Built-in extension - && docker-php-ext-install pgsql \ + && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pgsql \ && true @@ -460,7 +473,7 @@ RUN set -eux \ RUN set -eux \ # Installation: Generic # Type: Built-in extension - && docker-php-ext-install pspell \ + && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pspell \ && true @@ -490,7 +503,7 @@ RUN set -eux \ RUN set -eux \ # Installation: Generic # Type: Built-in extension - && docker-php-ext-install shmop \ + && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) shmop \ && true @@ -500,7 +513,7 @@ RUN set -eux \ # Type: Built-in extension # Custom: configure command && docker-php-ext-configure snmp --with-openssl-dir \ - && docker-php-ext-install snmp \ + && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) snmp \ && true @@ -510,7 +523,7 @@ RUN set -eux \ # Type: Built-in extension # Custom: configure command && docker-php-ext-configure soap --with-libxml-dir=/usr \ - && docker-php-ext-install soap \ + && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) soap \ && true @@ -518,7 +531,7 @@ RUN set -eux \ RUN set -eux \ # Installation: Generic # Type: Built-in extension - && docker-php-ext-install sockets \ + && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sockets \ && true @@ -537,7 +550,7 @@ RUN set -eux \ RUN set -eux \ # Installation: Generic # Type: Built-in extension - && docker-php-ext-install sysvmsg \ + && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvmsg \ && true @@ -545,7 +558,7 @@ RUN set -eux \ RUN set -eux \ # Installation: Generic # Type: Built-in extension - && docker-php-ext-install sysvsem \ + && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvsem \ && true @@ -553,7 +566,7 @@ RUN set -eux \ RUN set -eux \ # Installation: Generic # Type: Built-in extension - && docker-php-ext-install sysvshm \ + && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvshm \ && true @@ -562,7 +575,7 @@ RUN set -eux \ # Installation: Version specific # Type: Built-in extension # Installation - && docker-php-ext-install tidy \ + && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) tidy \ && true @@ -594,7 +607,7 @@ RUN set -eux \ # Type: Built-in extension # Custom: configure command && docker-php-ext-configure wddx --with-libxml-dir=/usr \ - && docker-php-ext-install wddx \ + && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) wddx \ && true @@ -615,7 +628,7 @@ RUN set -eux \ # Type: Built-in extension # Custom: configure command && docker-php-ext-configure xmlrpc --with-libxml-dir=/usr --with-iconv-dir=/usr \ - && docker-php-ext-install xmlrpc \ + && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xmlrpc \ && true @@ -623,7 +636,7 @@ RUN set -eux \ RUN set -eux \ # Installation: Generic # Type: Built-in extension - && docker-php-ext-install xsl \ + && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xsl \ && true @@ -645,7 +658,7 @@ RUN set -eux \ # Custom: configure command && docker-php-ext-configure zip --with-zlib-dir=/usr --with-pcre-dir=/usr \ # Installation - && docker-php-ext-install zip \ + && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) zip \ && true @@ -727,11 +740,13 @@ RUN set -eux \ libsybdb5 \ libtidy-0.99-0 \ libvpx1 \ + libwebp5 \ libxpm4 \ libxslt1.1 \ libyaml-0-2 \ snmp \ uuid \ + zlib1g \ ca-certificates \ && rm -rf /var/lib/apt/lists/* \ \ diff --git a/Dockerfiles/mods/Dockerfile-5.5 b/Dockerfiles/mods/Dockerfile-5.5 index 92241715..c6f1fe1f 100644 --- a/Dockerfiles/mods/Dockerfile-5.5 +++ b/Dockerfiles/mods/Dockerfile-5.5 @@ -30,6 +30,7 @@ RUN set -eux \ libmagickwand-dev \ libmcrypt-dev \ libmemcached-dev \ + libmysqlclient-dev \ libnghttp2-dev \ libpcre3-dev \ libpng-dev \ @@ -37,14 +38,12 @@ RUN set -eux \ libpspell-dev \ librabbitmq-dev \ librdkafka-dev \ - librecode-dev \ libsasl2-dev \ libsnmp-dev \ libssl-dev \ libtidy-dev \ libvpx-dev \ libwebp-dev \ - libwebp6 \ libxml2-dev \ libxpm-dev \ libxslt-dev \ @@ -52,8 +51,28 @@ RUN set -eux \ snmp \ uuid-dev \ zlib1g-dev \ +# Build tools + autoconf \ + bison \ + bisonc++ \ ca-certificates \ - git + curl \ + dpkg-dev \ + file \ + flex \ + g++ \ + gcc \ + git \ + lemon \ + libc-client-dev \ + libc-dev \ + libcurl4-openssl-dev \ + libssl-dev \ + make \ + patch \ + pkg-config \ + re2c \ + xz-utils # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr) @@ -160,7 +179,12 @@ RUN set -eux \ # -------------------- Installing PHP Extension: gd -------------------- RUN set -eux \ # Version specific pre-command - && ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libXpm.* /usr/lib/ \ + && ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libjpeg.* /usr/lib/ && \ +ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libpng.* /usr/lib/ && \ +ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libXpm.* /usr/lib/ && \ +mkdir /usr/include/freetype2/freetype && \ +ln -s /usr/include/freetype2/freetype.h /usr/include/freetype2/freetype/freetype.h \ + \ # Installation: Version specific # Type: Built-in extension # Custom: configure command @@ -330,6 +354,8 @@ RUN set -eux \ RUN set -eux \ # Installation: Version specific # Type: Built-in extension + # Default: configure command + && docker-php-ext-configure mysql --with-mysql --with-mysql-sock --with-zlib-dir=/usr --with-libdir="/lib/$(dpkg-architecture --query DEB_BUILD_MULTIARCH)" \ # Installation && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysql \ && true @@ -337,8 +363,9 @@ RUN set -eux \ # -------------------- Installing PHP Extension: mysqli -------------------- RUN set -eux \ - # Installation: Generic + # Installation: Version specific # Type: Built-in extension + # Installation && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysqli \ && true @@ -429,10 +456,11 @@ RUN set -eux \ # -------------------- Installing PHP Extension: pdo_mysql -------------------- RUN set -eux \ - # Installation: Generic + # Installation: Version specific # Type: Built-in extension - # Custom: configure command + # Default: configure command && docker-php-ext-configure pdo_mysql --with-zlib-dir=/usr \ + # Installation && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_mysql \ && true @@ -487,14 +515,6 @@ RUN set -eux \ && true -# -------------------- Installing PHP Extension: recode -------------------- -RUN set -eux \ - # Installation: Generic - # Type: Built-in extension - && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \ - && true - - # -------------------- Installing PHP Extension: redis -------------------- RUN set -eux \ # Installation: Version specific @@ -745,28 +765,28 @@ RUN set -eux \ libenchant1c2a \ libfbclient2 \ libfreetype6 \ - libicu57 \ + libicu52 \ libjpeg62-turbo \ - libmagickwand-6.q16-6 \ - libmariadbclient18 \ + libmagickwand-6.q16-2 \ libmcrypt4 \ libmemcachedutil2 \ + libmysqlclient18 \ libnghttp2-14 \ - libpng16-16 \ + libpng12-0 \ libpq5 \ - librabbitmq4 \ + librabbitmq1 \ librdkafka1 \ librecode0 \ libsybdb5 \ - libtidy5 \ - libvpx4 \ - libwebp-dev \ - libwebp6 \ + libtidy-0.99-0 \ + libvpx1 \ + libwebp5 \ libxpm4 \ libxslt1.1 \ libyaml-0-2 \ snmp \ uuid \ + zlib1g \ ca-certificates \ && rm -rf /var/lib/apt/lists/* \ \ diff --git a/Dockerfiles/mods/Dockerfile-5.6 b/Dockerfiles/mods/Dockerfile-5.6 index 1bd55e54..19e11c48 100644 --- a/Dockerfiles/mods/Dockerfile-5.6 +++ b/Dockerfiles/mods/Dockerfile-5.6 @@ -28,6 +28,7 @@ RUN set -eux \ libkrb5-dev \ libldap2-dev \ libmagickwand-dev \ + libmariadbclient-dev \ libmcrypt-dev \ libmemcached-dev \ libnghttp2-dev \ @@ -44,7 +45,6 @@ RUN set -eux \ libtidy-dev \ libvpx-dev \ libwebp-dev \ - libwebp6 \ libxml2-dev \ libxpm-dev \ libxslt-dev \ @@ -53,8 +53,28 @@ RUN set -eux \ snmp \ uuid-dev \ zlib1g-dev \ +# Build tools + autoconf \ + bison \ + bisonc++ \ ca-certificates \ - git + curl \ + dpkg-dev \ + file \ + flex \ + g++ \ + gcc \ + git \ + lemon \ + libc-client-dev \ + libc-dev \ + libcurl4-openssl-dev \ + libssl-dev \ + make \ + patch \ + pkg-config \ + re2c \ + xz-utils # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr) @@ -345,6 +365,8 @@ RUN set -eux \ RUN set -eux \ # Installation: Generic # Type: Built-in extension + # Custom: configure command + && docker-php-ext-configure mysql --with-mysql --with-mysql-sock --with-zlib-dir=/usr --with-libdir="/lib/$(dpkg-architecture --query DEB_BUILD_MULTIARCH)" \ && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysql \ && true diff --git a/Dockerfiles/mods/Dockerfile-7.0 b/Dockerfiles/mods/Dockerfile-7.0 index 905272a6..48d65b7a 100644 --- a/Dockerfiles/mods/Dockerfile-7.0 +++ b/Dockerfiles/mods/Dockerfile-7.0 @@ -38,6 +38,7 @@ RUN set -eux \ libmagick++-dev \ libmagickcore-6.q16-dev \ libmagickwand-dev \ + libmariadbclient-dev \ libmcrypt-dev \ libmemcached-dev \ libnghttp2-dev \ @@ -58,7 +59,6 @@ RUN set -eux \ libtool \ libvpx-dev \ libwebp-dev \ - libwebp6 \ libwebpdemux2 \ libwebpmux2 \ libxml2-dev \ @@ -70,8 +70,28 @@ RUN set -eux \ unixodbc-dev \ uuid-dev \ zlib1g-dev \ +# Build tools + autoconf \ + bison \ + bisonc++ \ ca-certificates \ - git + curl \ + dpkg-dev \ + file \ + flex \ + g++ \ + gcc \ + git \ + lemon \ + libc-client-dev \ + libc-dev \ + libcurl4-openssl-dev \ + libssl-dev \ + make \ + patch \ + pkg-config \ + re2c \ + xz-utils # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr) @@ -885,6 +905,7 @@ RUN set -eux \ libmagickcore-6.q16-3-extra \ libmagickwand-6.q16-3 \ libmagickwand-6.q16hdri-3 \ + libmariadbclient18 \ libmcrypt4 \ libmemcachedutil2 \ libnghttp2-14 \ diff --git a/Dockerfiles/mods/Dockerfile-7.1 b/Dockerfiles/mods/Dockerfile-7.1 index 487f63d0..ead0fb58 100644 --- a/Dockerfiles/mods/Dockerfile-7.1 +++ b/Dockerfiles/mods/Dockerfile-7.1 @@ -39,6 +39,7 @@ RUN set -eux \ libmagick++-dev \ libmagickcore-6.q16-dev \ libmagickwand-dev \ + libmariadbclient-dev \ libmcrypt-dev \ libmemcached-dev \ libnghttp2-dev \ @@ -59,7 +60,6 @@ RUN set -eux \ libtool \ libvpx-dev \ libwebp-dev \ - libwebp6 \ libwebpdemux2 \ libwebpmux3 \ libxml2-dev \ @@ -71,8 +71,28 @@ RUN set -eux \ unixodbc-dev \ uuid-dev \ zlib1g-dev \ +# Build tools + autoconf \ + bison \ + bisonc++ \ ca-certificates \ - git + curl \ + dpkg-dev \ + file \ + flex \ + g++ \ + gcc \ + git \ + lemon \ + libc-client-dev \ + libc-dev \ + libcurl4-openssl-dev \ + libssl-dev \ + make \ + patch \ + pkg-config \ + re2c \ + xz-utils # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr) @@ -897,6 +917,7 @@ RUN set -eux \ libmagickcore-6.q16-6-extra \ libmagickwand-6.q16-6 \ libmagickwand-6.q16hdri-6 \ + libmariadbclient18 \ libmcrypt4 \ libmemcachedutil2 \ libnghttp2-14 \ @@ -911,7 +932,6 @@ RUN set -eux \ libsybdb5 \ libtidy5deb1 \ libvpx5 \ - libwebp-dev \ libwebp6 \ libwebpdemux2 \ libwebpmux3 \ diff --git a/Dockerfiles/mods/Dockerfile-7.2 b/Dockerfiles/mods/Dockerfile-7.2 index 1f98ae35..a11bfae8 100644 --- a/Dockerfiles/mods/Dockerfile-7.2 +++ b/Dockerfiles/mods/Dockerfile-7.2 @@ -39,6 +39,7 @@ RUN set -eux \ libmagick++-dev \ libmagickcore-6.q16-dev \ libmagickwand-dev \ + libmariadbclient-dev \ libmcrypt-dev \ libmemcached-dev \ libnghttp2-dev \ @@ -59,7 +60,6 @@ RUN set -eux \ libtool \ libvpx-dev \ libwebp-dev \ - libwebp6 \ libwebpdemux2 \ libwebpmux3 \ libxml2-dev \ @@ -71,8 +71,28 @@ RUN set -eux \ unixodbc-dev \ uuid-dev \ zlib1g-dev \ +# Build tools + autoconf \ + bison \ + bisonc++ \ ca-certificates \ - git + curl \ + dpkg-dev \ + file \ + flex \ + g++ \ + gcc \ + git \ + lemon \ + libc-client-dev \ + libc-dev \ + libcurl4-openssl-dev \ + libssl-dev \ + make \ + patch \ + pkg-config \ + re2c \ + xz-utils # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr) @@ -900,6 +920,7 @@ RUN set -eux \ libmagickcore-6.q16-6-extra \ libmagickwand-6.q16-6 \ libmagickwand-6.q16hdri-6 \ + libmariadbclient18 \ libmcrypt4 \ libmemcachedutil2 \ libnghttp2-14 \ @@ -914,7 +935,6 @@ RUN set -eux \ libsybdb5 \ libtidy5deb1 \ libvpx5 \ - libwebp-dev \ libwebp6 \ libwebpdemux2 \ libwebpmux3 \ diff --git a/Dockerfiles/mods/Dockerfile-7.3 b/Dockerfiles/mods/Dockerfile-7.3 index d025b155..24780f75 100644 --- a/Dockerfiles/mods/Dockerfile-7.3 +++ b/Dockerfiles/mods/Dockerfile-7.3 @@ -38,6 +38,7 @@ RUN set -eux \ libmagick++-dev \ libmagickcore-6.q16-dev \ libmagickwand-dev \ + libmariadbclient-dev \ libmcrypt-dev \ libmemcached-dev \ libnghttp2-dev \ @@ -58,7 +59,6 @@ RUN set -eux \ libtool \ libvpx-dev \ libwebp-dev \ - libwebp6 \ libwebpdemux2 \ libwebpmux3 \ libxml2-dev \ @@ -70,8 +70,28 @@ RUN set -eux \ unixodbc-dev \ uuid-dev \ zlib1g-dev \ +# Build tools + autoconf \ + bison \ + bisonc++ \ ca-certificates \ - git + curl \ + dpkg-dev \ + file \ + flex \ + g++ \ + gcc \ + git \ + lemon \ + libc-client-dev \ + libc-dev \ + libcurl4-openssl-dev \ + libssl-dev \ + make \ + patch \ + pkg-config \ + re2c \ + xz-utils # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr) @@ -889,6 +909,7 @@ RUN set -eux \ libmagickcore-6.q16-6-extra \ libmagickwand-6.q16-6 \ libmagickwand-6.q16hdri-6 \ + libmariadbclient18 \ libmcrypt4 \ libmemcachedutil2 \ libnghttp2-14 \ @@ -903,7 +924,6 @@ RUN set -eux \ libsybdb5 \ libtidy5deb1 \ libvpx6 \ - libwebp-dev \ libwebp6 \ libwebpdemux2 \ libwebpmux3 \ diff --git a/Dockerfiles/mods/Dockerfile-7.4 b/Dockerfiles/mods/Dockerfile-7.4 index 486e633d..d4242495 100644 --- a/Dockerfiles/mods/Dockerfile-7.4 +++ b/Dockerfiles/mods/Dockerfile-7.4 @@ -39,6 +39,7 @@ RUN set -eux \ libmagick++-dev \ libmagickcore-6.q16-dev \ libmagickwand-dev \ + libmariadbclient-dev \ libmcrypt-dev \ libmemcached-dev \ libnghttp2-dev \ @@ -58,7 +59,6 @@ RUN set -eux \ libtool \ libvpx-dev \ libwebp-dev \ - libwebp6 \ libwebpdemux2 \ libwebpmux3 \ libxml2-dev \ @@ -70,8 +70,28 @@ RUN set -eux \ unixodbc-dev \ uuid-dev \ zlib1g-dev \ +# Build tools + autoconf \ + bison \ + bisonc++ \ ca-certificates \ - git + curl \ + dpkg-dev \ + file \ + flex \ + g++ \ + gcc \ + git \ + lemon \ + libc-client-dev \ + libc-dev \ + libcurl4-openssl-dev \ + libssl-dev \ + make \ + patch \ + pkg-config \ + re2c \ + xz-utils # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr) @@ -591,6 +611,8 @@ RUN set -eux \ RUN set -eux \ # Installation: Version specific # Type: Built-in extension + # Default: configure command + && docker-php-ext-configure snmp --with-openssl-dir \ # Installation && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) snmp \ && true @@ -600,6 +622,8 @@ RUN set -eux \ RUN set -eux \ # Installation: Version specific # Type: Built-in extension + # Default: configure command + && docker-php-ext-configure soap --with-libxml-dir=/usr \ # Installation && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) soap \ && true @@ -876,6 +900,7 @@ RUN set -eux \ libmagickcore-6.q16-6-extra \ libmagickwand-6.q16-6 \ libmagickwand-6.q16hdri-6 \ + libmariadbclient18 \ libmcrypt4 \ libmemcachedutil2 \ libnghttp2-14 \ @@ -889,7 +914,6 @@ RUN set -eux \ libsybdb5 \ libtidy5deb1 \ libvpx6 \ - libwebp-dev \ libwebp6 \ libwebpdemux2 \ libwebpmux3 \ diff --git a/Dockerfiles/mods/Dockerfile-8.0 b/Dockerfiles/mods/Dockerfile-8.0 index b2d6f831..1305b5ad 100644 --- a/Dockerfiles/mods/Dockerfile-8.0 +++ b/Dockerfiles/mods/Dockerfile-8.0 @@ -28,6 +28,7 @@ RUN set -eux \ libkrb5-dev \ libldap2-dev \ libmagickwand-dev \ + libmariadbclient-dev \ libmcrypt-dev \ libmemcached-dev \ libnghttp2-dev \ @@ -44,7 +45,6 @@ RUN set -eux \ libtidy-dev \ libvpx-dev \ libwebp-dev \ - libwebp6 \ libxml2-dev \ libxpm-dev \ libxslt-dev \ @@ -54,8 +54,28 @@ RUN set -eux \ unixodbc-dev \ uuid-dev \ zlib1g-dev \ +# Build tools + autoconf \ + bison \ + bisonc++ \ ca-certificates \ - git + curl \ + dpkg-dev \ + file \ + flex \ + g++ \ + gcc \ + git \ + lemon \ + libc-client-dev \ + libc-dev \ + libcurl4-openssl-dev \ + libssl-dev \ + make \ + patch \ + pkg-config \ + re2c \ + xz-utils # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr) @@ -793,6 +813,7 @@ RUN set -eux \ libicu67 \ libjpeg62-turbo \ libmagickwand-6.q16-6 \ + libmariadbclient18 \ libmcrypt4 \ libmemcachedutil2 \ libnghttp2-14 \ @@ -803,7 +824,6 @@ RUN set -eux \ libsybdb5 \ libtidy5deb1 \ libvpx6 \ - libwebp-dev \ libwebp6 \ libxpm4 \ libxslt1.1 \ diff --git a/Dockerfiles/mods/Dockerfile-8.1 b/Dockerfiles/mods/Dockerfile-8.1 index 826cfa50..28ba78fb 100644 --- a/Dockerfiles/mods/Dockerfile-8.1 +++ b/Dockerfiles/mods/Dockerfile-8.1 @@ -29,6 +29,7 @@ RUN set -eux \ libkrb5-dev \ libldap2-dev \ libmagickwand-dev \ + libmariadbclient-dev \ libmemcached-dev \ libpcre3-dev \ libpng-dev \ @@ -43,7 +44,6 @@ RUN set -eux \ libtidy-dev \ libvpx-dev \ libwebp-dev \ - libwebp6 \ libxml2-dev \ libxpm-dev \ libxslt-dev \ @@ -53,8 +53,28 @@ RUN set -eux \ unixodbc-dev \ uuid-dev \ zlib1g-dev \ +# Build tools + autoconf \ + bison \ + bisonc++ \ ca-certificates \ - git + curl \ + dpkg-dev \ + file \ + flex \ + g++ \ + gcc \ + git \ + lemon \ + libc-client-dev \ + libc-dev \ + libcurl4-openssl-dev \ + libssl-dev \ + make \ + patch \ + pkg-config \ + re2c \ + xz-utils # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr) @@ -769,6 +789,7 @@ RUN set -eux \ libicu67 \ libjpeg62-turbo \ libmagickwand-6.q16-6 \ + libmariadbclient18 \ libmemcachedutil2 \ libpng16-16 \ libpq5 \ @@ -777,7 +798,6 @@ RUN set -eux \ libsybdb5 \ libtidy5deb1 \ libvpx6 \ - libwebp-dev \ libwebp6 \ libxpm4 \ libxslt1.1 \ diff --git a/Dockerfiles/mods/Dockerfile-8.2 b/Dockerfiles/mods/Dockerfile-8.2 index 65adccc3..fb627257 100644 --- a/Dockerfiles/mods/Dockerfile-8.2 +++ b/Dockerfiles/mods/Dockerfile-8.2 @@ -29,6 +29,7 @@ RUN set -eux \ libkrb5-dev \ libldap2-dev \ libmagickwand-dev \ + libmariadbclient-dev \ libmemcached-dev \ libpcre3-dev \ libpng-dev \ @@ -43,7 +44,6 @@ RUN set -eux \ libtidy-dev \ libvpx-dev \ libwebp-dev \ - libwebp6 \ libxml2-dev \ libxpm-dev \ libxslt-dev \ @@ -53,8 +53,28 @@ RUN set -eux \ unixodbc-dev \ uuid-dev \ zlib1g-dev \ +# Build tools + autoconf \ + bison \ + bisonc++ \ ca-certificates \ - git + curl \ + dpkg-dev \ + file \ + flex \ + g++ \ + gcc \ + git \ + lemon \ + libc-client-dev \ + libc-dev \ + libcurl4-openssl-dev \ + libssl-dev \ + make \ + patch \ + pkg-config \ + re2c \ + xz-utils # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr) @@ -758,6 +778,7 @@ RUN set -eux \ libicu67 \ libjpeg62-turbo \ libmagickwand-6.q16-6 \ + libmariadbclient18 \ libmemcachedutil2 \ libpng16-16 \ libpq5 \ @@ -766,7 +787,6 @@ RUN set -eux \ libsybdb5 \ libtidy5deb1 \ libvpx6 \ - libwebp-dev \ libwebp6 \ libxpm4 \ libxslt1.1 \ diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2 index d7fb485b..c456c207 100644 --- a/Dockerfiles/work/Dockerfile-5.2 +++ b/Dockerfiles/work/Dockerfile-5.2 @@ -55,16 +55,16 @@ RUN set -eux \ dirmngr \ gnupg \ \ - && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138 \ - && echo "deb http://ftp.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/backports.list \ + && echo 'Acquire::Check-Valid-Until no;' > /etc/apt/apt.conf.d/99no-check-valid-until \ + && echo "deb http://archive.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \ && curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \ && echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \ && APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \ && echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \ - && APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 9DA31620334BD75D9DCB49F368818C72E52529D4 \ - && echo "deb http://repo.mongodb.org/apt/debian stretch/mongodb-org/4.0 main" > /etc/apt/sources.list.d/mongo.list \ + && APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \ + && echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main" > /etc/apt/sources.list.d/mongo.list \ && curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \ - && echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" > /etc/apt/sources.list.d/pgsql.list \ + && echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \ && curl -sS -k -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \ && echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \ \ @@ -79,7 +79,6 @@ RUN set -eux \ blackfire-agent \ build-essential \ bzip2 \ - certbot \ coreutils \ dnsutils \ dos2unix \ @@ -155,7 +154,7 @@ RUN set -eux \ mongodb-org-tools; \ fi \ && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ - && rm -rf /var/lib/apt/lists/* \ + && rm -rf /var/lib/apt/lists/* ### @@ -264,10 +263,10 @@ RUN set -eux \ \ \ # -------------------- wkhtmltopdf -------------------- - && VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )" \ + && VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )" \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ - libfontenc1 libxfont2 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \ + libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \ && curl -sS -L --fail -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \ && dpkg -i /tmp/wkhtmltopdf.deb \ && rm -f /tmp/wkhtmltopdf.deb \ diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3 index d817cba2..45e2f884 100644 --- a/Dockerfiles/work/Dockerfile-5.3 +++ b/Dockerfiles/work/Dockerfile-5.3 @@ -55,16 +55,16 @@ RUN set -eux \ dirmngr \ gnupg \ \ - && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138 \ - && echo "deb http://ftp.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/backports.list \ + && echo 'Acquire::Check-Valid-Until no;' > /etc/apt/apt.conf.d/99no-check-valid-until \ + && echo "deb http://archive.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \ && curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \ && echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \ && APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \ && echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \ - && APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 9DA31620334BD75D9DCB49F368818C72E52529D4 \ - && echo "deb http://repo.mongodb.org/apt/debian stretch/mongodb-org/4.0 main" > /etc/apt/sources.list.d/mongo.list \ + && APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \ + && echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main" > /etc/apt/sources.list.d/mongo.list \ && curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \ - && echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" > /etc/apt/sources.list.d/pgsql.list \ + && echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \ && curl -sS -k -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \ && echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \ \ @@ -79,7 +79,6 @@ RUN set -eux \ blackfire-agent \ build-essential \ bzip2 \ - certbot \ coreutils \ dnsutils \ dos2unix \ @@ -155,7 +154,7 @@ RUN set -eux \ mongodb-org-tools; \ fi \ && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ - && rm -rf /var/lib/apt/lists/* \ + && rm -rf /var/lib/apt/lists/* ### @@ -314,10 +313,10 @@ RUN set -eux \ \ \ # -------------------- wkhtmltopdf -------------------- - && VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )" \ + && VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )" \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ - libfontenc1 libxfont2 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \ + libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \ && curl -sS -L --fail -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \ && dpkg -i /tmp/wkhtmltopdf.deb \ && rm -f /tmp/wkhtmltopdf.deb \ diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index 824f8053..6de4ed97 100644 --- a/Dockerfiles/work/Dockerfile-5.4 +++ b/Dockerfiles/work/Dockerfile-5.4 @@ -154,7 +154,7 @@ RUN set -eux \ mongodb-org-tools; \ fi \ && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ - && rm -rf /var/lib/apt/lists/* \ + && rm -rf /var/lib/apt/lists/* ### diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index 59622db1..2a075bcf 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -55,16 +55,16 @@ RUN set -eux \ dirmngr \ gnupg \ \ - && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138 \ - && echo "deb http://ftp.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/backports.list \ + && echo 'Acquire::Check-Valid-Until no;' > /etc/apt/apt.conf.d/99no-check-valid-until \ + && echo "deb http://archive.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \ && curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \ && echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \ && APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \ && echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \ - && APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 9DA31620334BD75D9DCB49F368818C72E52529D4 \ - && echo "deb http://repo.mongodb.org/apt/debian stretch/mongodb-org/4.0 main" > /etc/apt/sources.list.d/mongo.list \ + && APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \ + && echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main" > /etc/apt/sources.list.d/mongo.list \ && curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \ - && echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" > /etc/apt/sources.list.d/pgsql.list \ + && echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \ && curl -sS -k -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \ && echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \ \ @@ -79,7 +79,6 @@ RUN set -eux \ blackfire-agent \ build-essential \ bzip2 \ - certbot \ coreutils \ dnsutils \ dos2unix \ @@ -155,7 +154,7 @@ RUN set -eux \ mongodb-org-tools; \ fi \ && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ - && rm -rf /var/lib/apt/lists/* \ + && rm -rf /var/lib/apt/lists/* ### @@ -354,10 +353,10 @@ RUN set -eux \ && chmod +x /usr/local/bin/symfony \ \ # -------------------- wkhtmltopdf -------------------- - && VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )" \ + && VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )" \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ - libfontenc1 libxfont2 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \ + libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \ && curl -sS -L --fail -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \ && dpkg -i /tmp/wkhtmltopdf.deb \ && rm -f /tmp/wkhtmltopdf.deb \ diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index c97235d8..380e6b3e 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -156,7 +156,7 @@ RUN set -eux \ mongodb-org-tools; \ fi \ && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ - && rm -rf /var/lib/apt/lists/* \ + && rm -rf /var/lib/apt/lists/* ### diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index 0e7230d2..9fd7bf51 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -156,7 +156,7 @@ RUN set -eux \ mongodb-org-tools; \ fi \ && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ - && rm -rf /var/lib/apt/lists/* \ + && rm -rf /var/lib/apt/lists/* ### diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index 2acb359a..6d3fb2af 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -155,7 +155,7 @@ RUN set -eux \ mongodb-org-tools; \ fi \ && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ - && rm -rf /var/lib/apt/lists/* \ + && rm -rf /var/lib/apt/lists/* ### diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index 7f8148d2..8643e06b 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -155,7 +155,7 @@ RUN set -eux \ mongodb-org-tools; \ fi \ && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ - && rm -rf /var/lib/apt/lists/* \ + && rm -rf /var/lib/apt/lists/* ### diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index 836a9aa9..64580555 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -155,7 +155,7 @@ RUN set -eux \ mongodb-org-tools; \ fi \ && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ - && rm -rf /var/lib/apt/lists/* \ + && rm -rf /var/lib/apt/lists/* ### diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4 index b7a21763..6d7efbab 100644 --- a/Dockerfiles/work/Dockerfile-7.4 +++ b/Dockerfiles/work/Dockerfile-7.4 @@ -155,7 +155,7 @@ RUN set -eux \ mongodb-org-tools; \ fi \ && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ - && rm -rf /var/lib/apt/lists/* \ + && rm -rf /var/lib/apt/lists/* ### diff --git a/Dockerfiles/work/Dockerfile-8.0 b/Dockerfiles/work/Dockerfile-8.0 index de38d97c..8fbcb6d1 100644 --- a/Dockerfiles/work/Dockerfile-8.0 +++ b/Dockerfiles/work/Dockerfile-8.0 @@ -155,7 +155,7 @@ RUN set -eux \ mongodb-org-tools; \ fi \ && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ - && rm -rf /var/lib/apt/lists/* \ + && rm -rf /var/lib/apt/lists/* ### diff --git a/Dockerfiles/work/Dockerfile-8.1 b/Dockerfiles/work/Dockerfile-8.1 index 02c96054..ecbb426c 100644 --- a/Dockerfiles/work/Dockerfile-8.1 +++ b/Dockerfiles/work/Dockerfile-8.1 @@ -155,7 +155,7 @@ RUN set -eux \ mongodb-org-tools; \ fi \ && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ - && rm -rf /var/lib/apt/lists/* \ + && rm -rf /var/lib/apt/lists/* ### diff --git a/Dockerfiles/work/Dockerfile-8.2 b/Dockerfiles/work/Dockerfile-8.2 index 6cfc1016..6d763701 100644 --- a/Dockerfiles/work/Dockerfile-8.2 +++ b/Dockerfiles/work/Dockerfile-8.2 @@ -155,7 +155,7 @@ RUN set -eux \ mongodb-org-tools; \ fi \ && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ - && rm -rf /var/lib/apt/lists/* \ + && rm -rf /var/lib/apt/lists/* ### diff --git a/build/ansible/DOCKERFILES/Dockerfile-base.j2 b/build/ansible/DOCKERFILES/Dockerfile-base.j2 index 0b161852..8c2e44bc 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-base.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-base.j2 @@ -3,6 +3,8 @@ FROM devilbox/php-fpm-5.2 {% elif php_version == 5.3 %} FROM devilbox/php-fpm-5.3 +{% elif php_version == 5.4 %} +FROM devilbox/php-fpm-5.4 {% elif php_version == 5.5 %} FROM devilbox/php-fpm-5.5 {% elif php_version == 8.0 %} @@ -57,15 +59,6 @@ RUN set -eux \ ### ### Upgrade (install ps) ### -{% if php_version in [5.4] %} -RUN set -eux \ - && rm -f /etc/apt/sources.list \ - && { \ - echo "deb http://ftp.debian.org/debian jessie main"; \ - echo "#deb http://ftp.debian.org/debian jessie-updates main"; \ - echo "deb http://security.debian.org/debian-security jessie/updates main"; \ - } | tee /etc/apt/sources.list -{% endif %} RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -q \ && DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \ diff --git a/build/ansible/DOCKERFILES/Dockerfile-mods.j2 b/build/ansible/DOCKERFILES/Dockerfile-mods.j2 index 270e7dcd..e51aa380 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-mods.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-mods.j2 @@ -37,8 +37,28 @@ RUN set -eux \ {% for build_dep in build_deps | unique | sort %} {{ build_dep }} \ {% endfor %} +# Build tools + autoconf \ + bison \ + bisonc++ \ ca-certificates \ - git + curl \ + dpkg-dev \ + file \ + flex \ + g++ \ + gcc \ + git \ + lemon \ + libc-client-dev \ + libc-dev \ + libcurl4-openssl-dev \ + libssl-dev \ + make \ + patch \ + pkg-config \ + re2c \ + xz-utils # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr) @@ -94,9 +114,12 @@ RUN set -eux \ {%- if 'configure' in extensions_available[ext][php_version] -%} {{- "\n\t" }}# Custom: configure command {{- "\n\t" }}&& docker-php-ext-configure {{ ext }} {{ extensions_available[ext][php_version]['configure'] }} \ + {%- elif 'configure' in extensions_available[ext]['all'] -%} + {{- "\n\t" }}# Default: configure command + {{- "\n\t" }}&& docker-php-ext-configure {{ ext }} {{ extensions_available[ext]['all']['configure'] }} \ {%- endif -%} {{- "\n\t" }}# Installation - {{- "\n\t" }}&& docker-php-ext-install{% if php_version != 5.4 %} -j$(getconf _NPROCESSORS_ONLN){% endif %} {{ ext }} \ + {{- "\n\t" }}&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) {{ ext }} \ {#- # -------------------- 2.) PECL -------------------- -#} @@ -157,7 +180,7 @@ RUN set -eux \ {{- "\n\t" }}# Custom: configure command {{- "\n\t" }}&& docker-php-ext-configure {{ ext }} {{ extensions_available[ext]['all']['configure'] }} \ {%- endif -%} - {{- "\n\t" }}&& docker-php-ext-install{% if php_version != 5.4 %} -j$(getconf _NPROCESSORS_ONLN){% endif %} {{ ext }} \ + {{- "\n\t" }}&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) {{ ext }} \ {#- # -------------------- 2.) PECL -------------------- -#} diff --git a/build/ansible/DOCKERFILES/Dockerfile-work.j2 b/build/ansible/DOCKERFILES/Dockerfile-work.j2 index c7346517..cc9f9773 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-work.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-work.j2 @@ -92,7 +92,7 @@ RUN set -eux \ blackfire-agent \ build-essential \ bzip2 \ -{% if php_version != 5.4 %} +{% if php_version not in [5.2, 5.3, 5.4, 5.5] %} certbot \ {% endif %} coreutils \ @@ -177,7 +177,7 @@ RUN set -eux \ mongodb-org-tools; \ fi \ && DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ - && rm -rf /var/lib/apt/lists/* \ + && rm -rf /var/lib/apt/lists/* ### diff --git a/build/ansible/group_vars/all/mods.yml b/build/ansible/group_vars/all/mods.yml index 577e9f6c..ae79b15b 100644 --- a/build/ansible/group_vars/all/mods.yml +++ b/build/ansible/group_vars/all/mods.yml @@ -146,14 +146,15 @@ extensions_enabled: # command: [required] Custom command to install and enable a module extensions_available: amqp: - # Does not build on arm64 on PHP 5.3 - disabled: [5.3] + disabled: [] 5.2: type: pecl version: 1.6.1 - #5.3: - # type: pecl - # version: 1.9.3 + run_dep: [librabbitmq1] + 5.3: + type: pecl + version: 1.9.3 + run_dep: [librabbitmq1] 5.4: type: pecl version: 1.9.3 @@ -161,6 +162,7 @@ extensions_available: 5.5: type: pecl version: 1.9.3 + run_dep: [librabbitmq1] all: type: pecl command: echo "/usr" | pecl install amqp @@ -262,41 +264,52 @@ extensions_available: 5.2: type: pecl build_dep: [libmagic-dev] - all: - type: builtin + run_dep: [libmagic1] filter: already_avail: "{{ php_all_versions }}" # Available by default ftp: - already_avail: [5.5, 5.6, 7.0, 7.1, 7.2, 7.3, 7.4, 8.0, 8.1, 8.2] - all: - type: builtin - configure: --with-openssl-dir - build_dep: [libssl-dev] + already_avail: "{{ php_all_versions }}" # Available by default gd: 5.2: type: builtin pre: | ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libjpeg.* /usr/lib/ && \ ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libpng.* /usr/lib/ && \ - ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libXpm.* /usr/lib/ \ + ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libXpm.* /usr/lib/ && \ + mkdir /usr/include/freetype2/freetype && \ + ln -s /usr/include/freetype2/freetype.h /usr/include/freetype2/freetype/freetype.h \ 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-native-ttf - run_dep: [libpng16-16, libjpeg62-turbo, libxpm4, libvpx4, libfreetype6, libwebp6] + run_dep: [libpng12-0, libjpeg62-turbo, libxpm4, libvpx1, libfreetype6, libwebp5] 5.3: type: builtin - pre: ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libXpm.* /usr/lib/ + pre: | + ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libjpeg.* /usr/lib/ && \ + ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libpng.* /usr/lib/ && \ + ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libXpm.* /usr/lib/ && \ + mkdir /usr/include/freetype2/freetype && \ + ln -s /usr/include/freetype2/freetype.h /usr/include/freetype2/freetype/freetype.h \ 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-native-ttf - run_dep: [libpng16-16, libjpeg62-turbo, libxpm4, libvpx4, libfreetype6, libwebp6] + run_dep: [libpng12-0, libjpeg62-turbo, libxpm4, libvpx1, libfreetype6, libwebp5] 5.4: type: builtin - pre: ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libXpm.* /usr/lib/ + pre: | + ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libjpeg.* /usr/lib/ && \ + ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libpng.* /usr/lib/ && \ + ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libXpm.* /usr/lib/ && \ + mkdir /usr/include/freetype2/freetype && \ + ln -s /usr/include/freetype2/freetype.h /usr/include/freetype2/freetype/freetype.h \ 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-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] + run_dep: [libpng12-0, libjpeg62-turbo, libxpm4, libvpx1, libfreetype6, libwebp5] 5.5: type: builtin - pre: ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libXpm.* /usr/lib/ + pre: | + ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libjpeg.* /usr/lib/ && \ + ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libpng.* /usr/lib/ && \ + ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libXpm.* /usr/lib/ && \ + mkdir /usr/include/freetype2/freetype && \ + ln -s /usr/include/freetype2/freetype.h /usr/include/freetype2/freetype/freetype.h \ 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-native-ttf - run_dep: [libpng16-16, libjpeg62-turbo, libxpm4, libvpx4, libfreetype6, libwebp6] + run_dep: [libpng12-0, libjpeg62-turbo, libxpm4, libvpx1, libfreetype6, libwebp5] 5.6: type: builtin pre: ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libXpm.* /usr/lib/ @@ -375,6 +388,7 @@ extensions_available: disabled: [5.2, 5.3, 5.4] # Only available since 5.3. 5.3 and 5.4 segfaults 5.5: type: pecl + run_dep: [libmagickwand-6.q16-2, libwebp5, ghostscript] 5.6: type: pecl run_dep: [libmagickwand-6.q16-3, libwebp6, ghostscript] @@ -383,8 +397,8 @@ extensions_available: run_dep: [libmagickwand-6.q16-3, libwebp6, ghostscript] all: type: pecl - build_dep: [libmagickwand-dev, libwebp6, ghostscript] - run_dep: [libmagickwand-6.q16-6, libwebp-dev, ghostscript] + build_dep: [libmagickwand-dev, libwebp-dev, ghostscript] + run_dep: [libmagickwand-6.q16-6, libwebp6, ghostscript] # https://bugs.php.net/bug.php?id=77683 # https://github.com/Imagick/imagick/issues/262 (policy prevents PDF from being read) post: | @@ -414,16 +428,16 @@ extensions_available: intl: 5.2: type: pecl - run_dep: [libicu57] + run_dep: [libicu52] 5.3: type: builtin - run_dep: [libicu57] + run_dep: [libicu52] 5.4: type: builtin run_dep: [libicu52] 5.5: type: builtin - run_dep: [libicu57] + run_dep: [libicu52] 5.6: type: builtin run_dep: [libicu57] @@ -467,9 +481,7 @@ extensions_available: libxml: already_avail: "{{ php_all_versions }}" # Available by default mbstring: - already_avail: [5.2, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3, 7.4, 8.0, 8.1, 8.2] - all: - type: builtin + already_avail: "{{ php_all_versions }}" # Available by default mcrypt: # mcrypt 1.0.4 requires PHP 8.1.0 or older # version >= 7.2.0, version <= 8.1.0, excluded versions: 8.1.0 @@ -499,7 +511,6 @@ extensions_available: run_dep: [libmcrypt4] build_dep: [libmcrypt-dev] memcache: - disabled: [] 5.2: type: pecl version: 2.2.7 @@ -604,7 +615,10 @@ extensions_available: command: yes yes | pecl install mongo build_dep: [libssl-dev, libsasl2-dev] mongodb: - disabled: [5.2, 5.3] + disabled: [5.2] + 5.3: + type: pecl + version: 0.6.3 5.4: type: pecl version: 1.2.11 @@ -624,7 +638,6 @@ extensions_available: type: pecl build_dep: [libssl-dev, libsasl2-dev] msgpack: - disabled: [] 5.2: type: pecl version: 0.5.7 @@ -643,25 +656,53 @@ extensions_available: all: type: pecl mysql: - already_avail: [5.2, 5.3] disabled: [7.0, 7.1, 7.2, 7.3, 7.4, 8.0, 8.1, 8.2] # Deprecated in newer versions + 5.2: + type: builtin + run_dep: [libmysqlclient18] + build_dep: [libmysqlclient-dev] + 5.3: + type: builtin + run_dep: [libmysqlclient18] + build_dep: [libmysqlclient-dev] 5.4: type: builtin run_dep: [libmysqlclient18] + build_dep: [libmysqlclient-dev] 5.5: type: builtin + run_dep: [libmysqlclient18] + build_dep: [libmysqlclient-dev] all: type: builtin + configure: --with-mysql --with-mysql-sock --with-zlib-dir=/usr --with-libdir="/lib/$(dpkg-architecture --query DEB_BUILD_MULTIARCH)" run_dep: [libmariadbclient18] + build_dep: [libmariadbclient-dev] mysqli: - already_avail: [5.2] + 5.2: + type: builtin + run_dep: [libmysqlclient18] + build_dep: [libmysqlclient-dev] + 5.3: + type: builtin + run_dep: [libmysqlclient18] + build_dep: [libmysqlclient-dev] + 5.4: + type: builtin + run_dep: [libmysqlclient18] + build_dep: [libmysqlclient-dev] + 5.5: + type: builtin + run_dep: [libmysqlclient18] + build_dep: [libmysqlclient-dev] all: type: builtin + run_dep: [libmariadbclient18] + build_dep: [libmariadbclient-dev] mysqlnd: disabled: [5.2] already_avail: [5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3, 7.4, 8.0, 8.1, 8.2] oauth: - disabled: [] 5.2: type: pecl version: 1.2.3 @@ -717,7 +758,6 @@ extensions_available: odbc: disabled: "{{ php_all_versions }}" # TODO: sqlext.h' not found! opcache: - disabled: [] 5.2: type: pecl command: pecl install zendopcache @@ -745,7 +785,6 @@ extensions_available: pdo: already_avail: "{{ php_all_versions }}" pdo_dblib: - disabled: [] all: type: builtin pre: ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libsybdb.* /usr/lib/ @@ -757,11 +796,27 @@ extensions_available: build_dep: [libfbclient2, libib-util, firebird-dev] run_dep: [libfbclient2] pdo_mysql: - already_avail: [5.2] + 5.2: + type: builtin + run_dep: [libmysqlclient18] + build_dep: [zlib1g-dev, libmysqlclient-dev] + 5.3: + type: builtin + run_dep: [libmysqlclient18] + build_dep: [zlib1g-dev, libmysqlclient-dev] + 5.4: + type: builtin + run_dep: [libmysqlclient18] + build_dep: [zlib1g-dev, libmysqlclient-dev] + 5.5: + type: builtin + run_dep: [libmysqlclient18] + build_dep: [zlib1g-dev, libmysqlclient-dev] all: type: builtin configure: --with-zlib-dir=/usr - build_dep: [zlib1g-dev] + run_dep: [libmariadbclient18] + build_dep: [zlib1g-dev, libmariadbclient-dev] pdo_oci: disabled: [5.2, 5.3, 5.4, 5.5, 5.6] 7.2: @@ -916,7 +971,7 @@ extensions_available: already_avail: "{{ php_all_versions }}" recode: disabled: [7.4, 8.0, 8.1, 8.2] - already_avail: [5.3, 5.4] + already_avail: [5.2, 5.3, 5.4, 5.5] all: type: builtin build_dep: [librecode-dev] @@ -1030,7 +1085,6 @@ extensions_available: build_dep: [libssl-dev, libsnmp-dev, snmp] run_dep: [snmp] soap: - already_avail: [5.2] 7.4: type: builtin all: @@ -1099,6 +1153,7 @@ extensions_available: 5.3: type: pecl version: 1.9.23 + run_dep: [libnghttp2-5] 5.4: type: pecl version: 1.9.23 @@ -1132,16 +1187,16 @@ extensions_available: tidy: 5.2: type: builtin - run_dep: [libtidy5] + run_dep: [libtidy-0.99-0] 5.3: type: builtin - run_dep: [libtidy5] + run_dep: [libtidy-0.99-0] 5.4: type: builtin run_dep: [libtidy-0.99-0] 5.5: type: builtin - run_dep: [libtidy5] + run_dep: [libtidy-0.99-0] 5.6: type: builtin run_dep: [libtidy5] @@ -1155,7 +1210,6 @@ extensions_available: tokenizer: already_avail: "{{ php_all_versions }}" uploadprogress: - disabled: [] 5.2: type: pecl version: 1.1.4 @@ -1296,7 +1350,6 @@ extensions_available: configure: --with-libxml-dir=/usr build_dep: [libxml2-dev] xdebug: - disabled: [] 5.2: type: pecl version: 2.2.7 @@ -1383,22 +1436,22 @@ extensions_available: type: builtin configure: --with-zlib-dir=/usr --with-pcre-dir=/usr build_dep: [zlib1g-dev] - run_dep: [] + run_dep: [zlib1g] 5.3: type: builtin configure: --with-zlib-dir=/usr --with-pcre-dir=/usr build_dep: [zlib1g-dev] - run_dep: [] + run_dep: [zlib1g] 5.4: type: builtin configure: --with-zlib-dir=/usr --with-pcre-dir=/usr build_dep: [zlib1g-dev] - run_dep: [] + run_dep: [zlib1g] 5.5: type: builtin configure: --with-zlib-dir=/usr --with-pcre-dir=/usr build_dep: [zlib1g-dev] - run_dep: [] + run_dep: [zlib1g] 7.4: type: builtin configure: --with-zip diff --git a/build/ansible/group_vars/all/work.yml b/build/ansible/group_vars/all/work.yml index 7f67662a..abd4e91a 100644 --- a/build/ansible/group_vars/all/work.yml +++ b/build/ansible/group_vars/all/work.yml @@ -128,9 +128,18 @@ software_enabled: # apt_repositories_available: backports: + 5.2: + pre: echo 'Acquire::Check-Valid-Until no;' > /etc/apt/apt.conf.d/99no-check-valid-until + deb: deb http://archive.debian.org/debian jessie-backports main + 5.3: + pre: echo 'Acquire::Check-Valid-Until no;' > /etc/apt/apt.conf.d/99no-check-valid-until + deb: deb http://archive.debian.org/debian jessie-backports main 5.4: pre: echo 'Acquire::Check-Valid-Until no;' > /etc/apt/apt.conf.d/99no-check-valid-until deb: deb http://archive.debian.org/debian jessie-backports main + 5.5: + pre: echo 'Acquire::Check-Valid-Until no;' > /etc/apt/apt.conf.d/99no-check-valid-until + deb: deb http://archive.debian.org/debian jessie-backports main all: pre: apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138 deb: deb http://ftp.debian.org/debian stretch-backports main @@ -157,24 +166,30 @@ apt_repositories_available: # Get keys # gpg --dry-run --with-fingerprint < <(curl https://www.mongodb.org/static/pgp/server-3.6.asc) | grep fingerprint | sed 's/.*=//g' | sed 's/ //g' mongo: + 5.2: + deb: deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main + key: 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 + 5.3: + deb: deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main + key: 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 5.4: deb: deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main key: 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 + 5.5: + deb: deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main + key: 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 all: deb: deb http://repo.mongodb.org/apt/debian stretch/mongodb-org/4.0 main key: 9DA31620334BD75D9DCB49F368818C72E52529D4 pgsql: 5.2: - deb: deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main - pre: curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - + deb: deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main 5.3: - deb: deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main - pre: curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - + deb: deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main 5.4: deb: deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main 5.5: - deb: deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main - pre: curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - + deb: deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main 5.6: deb: deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main pre: curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - @@ -932,6 +947,24 @@ software_available: post: chmod +x /usr/local/bin/symfony wkhtmltopdf: check: wkhtmltopdf --version | grep -E "^wkhtmltopdf [0-9][.0-9]+\s+\(.+patched.+\)" + 5.2: + pre: VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )" + command: | + DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ + libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \ + && curl -sS -L --fail -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \ + && dpkg -i /tmp/wkhtmltopdf.deb \ + && rm -f /tmp/wkhtmltopdf.deb \ + 5.3: + pre: VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )" + command: | + DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ + libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \ + && curl -sS -L --fail -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \ + && dpkg -i /tmp/wkhtmltopdf.deb \ + && rm -f /tmp/wkhtmltopdf.deb \ 5.4: pre: VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )" command: | @@ -941,6 +974,15 @@ software_available: && curl -sS -L --fail -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \ && dpkg -i /tmp/wkhtmltopdf.deb \ && rm -f /tmp/wkhtmltopdf.deb \ + 5.5: + pre: VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )" + command: | + DEBIAN_FRONTEND=noninteractive apt-get update -qq \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ + libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \ + && curl -sS -L --fail -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \ + && dpkg -i /tmp/wkhtmltopdf.deb \ + && rm -f /tmp/wkhtmltopdf.deb \ 5.6: command: | DEBIAN_FRONTEND=noninteractive apt-get update -qq \ From 6c6470c181b2ecf9fe18ea8301ba74a388532150 Mon Sep 17 00:00:00 2001 From: cytopia Date: Mon, 21 Mar 2022 14:59:34 +0100 Subject: [PATCH 10/19] Fix build --- CHANGELOG.md | 8 ++++-- Dockerfiles/mods/Dockerfile-5.2 | 5 ++-- Dockerfiles/mods/Dockerfile-5.3 | 5 ++-- Dockerfiles/mods/Dockerfile-5.4 | 5 ++-- Dockerfiles/mods/Dockerfile-5.5 | 7 +++-- Dockerfiles/mods/Dockerfile-5.6 | 13 ++++++---- Dockerfiles/mods/Dockerfile-7.0 | 4 +-- Dockerfiles/mods/Dockerfile-7.1 | 4 +-- Dockerfiles/mods/Dockerfile-7.2 | 4 +-- Dockerfiles/mods/Dockerfile-7.3 | 4 +-- Dockerfiles/mods/Dockerfile-7.4 | 4 +-- Dockerfiles/mods/Dockerfile-8.0 | 4 +-- Dockerfiles/mods/Dockerfile-8.1 | 4 +-- Dockerfiles/mods/Dockerfile-8.2 | 4 +-- build/ansible/group_vars/all/mods.yml | 37 ++++++++++++--------------- build/ansible/group_vars/all/work.yml | 2 ++ 16 files changed, 58 insertions(+), 56 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 889ad89a..45193382 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,9 +9,13 @@ #### Fixed - Fixed `mongodb-org-shell` and `mongodb-org-tools` install +#### Added +- Re-added `mongodb` for PHP 5.3 + #### Changed -- Switch PHP 5.4 base image to [devilbox/php-fpm-5.4](https://github.com/devilbox/docker-php-fpm-5.4) for arm64 support -- Switch PHP 5.5 base image to [devilbox/php-fpm-5.5](https://github.com/devilbox/docker-php-fpm-5.5) for arm64 support +- Switch PHP 5.4 base image to [devilbox/php-fpm-5.4](https://github.com/devilbox/docker-php-fpm-5.4) for potential arm64 support +- Switch PHP 5.5 base image to [devilbox/php-fpm-5.5](https://github.com/devilbox/docker-php-fpm-5.5) for potential arm64 support +- Changed base image back to Debian Jessie for PHP 5.2 and PHP 5.3 ## Release 0.135 diff --git a/Dockerfiles/mods/Dockerfile-5.2 b/Dockerfiles/mods/Dockerfile-5.2 index 3081a6e0..6d61575d 100644 --- a/Dockerfiles/mods/Dockerfile-5.2 +++ b/Dockerfiles/mods/Dockerfile-5.2 @@ -289,11 +289,10 @@ RUN set -eux \ # -------------------- Installing PHP Extension: mysql -------------------- RUN set -eux \ - # Installation: Version specific + # Installation: Generic # Type: Built-in extension - # Default: configure command + # Custom: configure command && docker-php-ext-configure mysql --with-mysql --with-mysql-sock --with-zlib-dir=/usr --with-libdir="/lib/$(dpkg-architecture --query DEB_BUILD_MULTIARCH)" \ - # Installation && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysql \ && true diff --git a/Dockerfiles/mods/Dockerfile-5.3 b/Dockerfiles/mods/Dockerfile-5.3 index 5de4a6f7..73afd676 100644 --- a/Dockerfiles/mods/Dockerfile-5.3 +++ b/Dockerfiles/mods/Dockerfile-5.3 @@ -311,11 +311,10 @@ RUN set -eux \ # -------------------- Installing PHP Extension: mysql -------------------- RUN set -eux \ - # Installation: Version specific + # Installation: Generic # Type: Built-in extension - # Default: configure command + # Custom: configure command && docker-php-ext-configure mysql --with-mysql --with-mysql-sock --with-zlib-dir=/usr --with-libdir="/lib/$(dpkg-architecture --query DEB_BUILD_MULTIARCH)" \ - # Installation && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysql \ && true diff --git a/Dockerfiles/mods/Dockerfile-5.4 b/Dockerfiles/mods/Dockerfile-5.4 index d6b078dd..0ec0cada 100644 --- a/Dockerfiles/mods/Dockerfile-5.4 +++ b/Dockerfiles/mods/Dockerfile-5.4 @@ -311,11 +311,10 @@ RUN set -eux \ # -------------------- Installing PHP Extension: mysql -------------------- RUN set -eux \ - # Installation: Version specific + # Installation: Generic # Type: Built-in extension - # Default: configure command + # Custom: configure command && docker-php-ext-configure mysql --with-mysql --with-mysql-sock --with-zlib-dir=/usr --with-libdir="/lib/$(dpkg-architecture --query DEB_BUILD_MULTIARCH)" \ - # Installation && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysql \ && true diff --git a/Dockerfiles/mods/Dockerfile-5.5 b/Dockerfiles/mods/Dockerfile-5.5 index c6f1fe1f..16c3e068 100644 --- a/Dockerfiles/mods/Dockerfile-5.5 +++ b/Dockerfiles/mods/Dockerfile-5.5 @@ -352,11 +352,10 @@ RUN set -eux \ # -------------------- Installing PHP Extension: mysql -------------------- RUN set -eux \ - # Installation: Version specific + # Installation: Generic # Type: Built-in extension - # Default: configure command + # Custom: configure command && docker-php-ext-configure mysql --with-mysql --with-mysql-sock --with-zlib-dir=/usr --with-libdir="/lib/$(dpkg-architecture --query DEB_BUILD_MULTIARCH)" \ - # Installation && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysql \ && true @@ -771,7 +770,7 @@ RUN set -eux \ libmcrypt4 \ libmemcachedutil2 \ libmysqlclient18 \ - libnghttp2-14 \ + libnghttp2-5 \ libpng12-0 \ libpq5 \ librabbitmq1 \ diff --git a/Dockerfiles/mods/Dockerfile-5.6 b/Dockerfiles/mods/Dockerfile-5.6 index 19e11c48..ca2f6045 100644 --- a/Dockerfiles/mods/Dockerfile-5.6 +++ b/Dockerfiles/mods/Dockerfile-5.6 @@ -363,18 +363,20 @@ RUN set -eux \ # -------------------- Installing PHP Extension: mysql -------------------- RUN set -eux \ - # Installation: Generic + # Installation: Version specific # Type: Built-in extension - # Custom: configure command + # Default: configure command && docker-php-ext-configure mysql --with-mysql --with-mysql-sock --with-zlib-dir=/usr --with-libdir="/lib/$(dpkg-architecture --query DEB_BUILD_MULTIARCH)" \ + # Installation && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysql \ && true # -------------------- Installing PHP Extension: mysqli -------------------- RUN set -eux \ - # Installation: Generic + # Installation: Version specific # Type: Built-in extension + # Installation && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysqli \ && true @@ -465,10 +467,11 @@ RUN set -eux \ # -------------------- Installing PHP Extension: pdo_mysql -------------------- RUN set -eux \ - # Installation: Generic + # Installation: Version specific # Type: Built-in extension - # Custom: configure command + # Default: configure command && docker-php-ext-configure pdo_mysql --with-zlib-dir=/usr \ + # Installation && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_mysql \ && true diff --git a/Dockerfiles/mods/Dockerfile-7.0 b/Dockerfiles/mods/Dockerfile-7.0 index 48d65b7a..7b17e3cd 100644 --- a/Dockerfiles/mods/Dockerfile-7.0 +++ b/Dockerfiles/mods/Dockerfile-7.0 @@ -38,7 +38,7 @@ RUN set -eux \ libmagick++-dev \ libmagickcore-6.q16-dev \ libmagickwand-dev \ - libmariadbclient-dev \ + libmariadb-dev \ libmcrypt-dev \ libmemcached-dev \ libnghttp2-dev \ @@ -905,7 +905,7 @@ RUN set -eux \ libmagickcore-6.q16-3-extra \ libmagickwand-6.q16-3 \ libmagickwand-6.q16hdri-3 \ - libmariadbclient18 \ + libmariadbd19 \ libmcrypt4 \ libmemcachedutil2 \ libnghttp2-14 \ diff --git a/Dockerfiles/mods/Dockerfile-7.1 b/Dockerfiles/mods/Dockerfile-7.1 index ead0fb58..1b158b7b 100644 --- a/Dockerfiles/mods/Dockerfile-7.1 +++ b/Dockerfiles/mods/Dockerfile-7.1 @@ -39,7 +39,7 @@ RUN set -eux \ libmagick++-dev \ libmagickcore-6.q16-dev \ libmagickwand-dev \ - libmariadbclient-dev \ + libmariadb-dev \ libmcrypt-dev \ libmemcached-dev \ libnghttp2-dev \ @@ -917,7 +917,7 @@ RUN set -eux \ libmagickcore-6.q16-6-extra \ libmagickwand-6.q16-6 \ libmagickwand-6.q16hdri-6 \ - libmariadbclient18 \ + libmariadbd19 \ libmcrypt4 \ libmemcachedutil2 \ libnghttp2-14 \ diff --git a/Dockerfiles/mods/Dockerfile-7.2 b/Dockerfiles/mods/Dockerfile-7.2 index a11bfae8..0357f41f 100644 --- a/Dockerfiles/mods/Dockerfile-7.2 +++ b/Dockerfiles/mods/Dockerfile-7.2 @@ -39,7 +39,7 @@ RUN set -eux \ libmagick++-dev \ libmagickcore-6.q16-dev \ libmagickwand-dev \ - libmariadbclient-dev \ + libmariadb-dev \ libmcrypt-dev \ libmemcached-dev \ libnghttp2-dev \ @@ -920,7 +920,7 @@ RUN set -eux \ libmagickcore-6.q16-6-extra \ libmagickwand-6.q16-6 \ libmagickwand-6.q16hdri-6 \ - libmariadbclient18 \ + libmariadbd19 \ libmcrypt4 \ libmemcachedutil2 \ libnghttp2-14 \ diff --git a/Dockerfiles/mods/Dockerfile-7.3 b/Dockerfiles/mods/Dockerfile-7.3 index 24780f75..5d8b34b3 100644 --- a/Dockerfiles/mods/Dockerfile-7.3 +++ b/Dockerfiles/mods/Dockerfile-7.3 @@ -38,7 +38,7 @@ RUN set -eux \ libmagick++-dev \ libmagickcore-6.q16-dev \ libmagickwand-dev \ - libmariadbclient-dev \ + libmariadb-dev \ libmcrypt-dev \ libmemcached-dev \ libnghttp2-dev \ @@ -909,7 +909,7 @@ RUN set -eux \ libmagickcore-6.q16-6-extra \ libmagickwand-6.q16-6 \ libmagickwand-6.q16hdri-6 \ - libmariadbclient18 \ + libmariadbd19 \ libmcrypt4 \ libmemcachedutil2 \ libnghttp2-14 \ diff --git a/Dockerfiles/mods/Dockerfile-7.4 b/Dockerfiles/mods/Dockerfile-7.4 index d4242495..d8aedb8d 100644 --- a/Dockerfiles/mods/Dockerfile-7.4 +++ b/Dockerfiles/mods/Dockerfile-7.4 @@ -39,7 +39,7 @@ RUN set -eux \ libmagick++-dev \ libmagickcore-6.q16-dev \ libmagickwand-dev \ - libmariadbclient-dev \ + libmariadb-dev \ libmcrypt-dev \ libmemcached-dev \ libnghttp2-dev \ @@ -900,7 +900,7 @@ RUN set -eux \ libmagickcore-6.q16-6-extra \ libmagickwand-6.q16-6 \ libmagickwand-6.q16hdri-6 \ - libmariadbclient18 \ + libmariadbd19 \ libmcrypt4 \ libmemcachedutil2 \ libnghttp2-14 \ diff --git a/Dockerfiles/mods/Dockerfile-8.0 b/Dockerfiles/mods/Dockerfile-8.0 index 1305b5ad..a78458a5 100644 --- a/Dockerfiles/mods/Dockerfile-8.0 +++ b/Dockerfiles/mods/Dockerfile-8.0 @@ -28,7 +28,7 @@ RUN set -eux \ libkrb5-dev \ libldap2-dev \ libmagickwand-dev \ - libmariadbclient-dev \ + libmariadb-dev \ libmcrypt-dev \ libmemcached-dev \ libnghttp2-dev \ @@ -813,7 +813,7 @@ RUN set -eux \ libicu67 \ libjpeg62-turbo \ libmagickwand-6.q16-6 \ - libmariadbclient18 \ + libmariadbd19 \ libmcrypt4 \ libmemcachedutil2 \ libnghttp2-14 \ diff --git a/Dockerfiles/mods/Dockerfile-8.1 b/Dockerfiles/mods/Dockerfile-8.1 index 28ba78fb..0e062d6e 100644 --- a/Dockerfiles/mods/Dockerfile-8.1 +++ b/Dockerfiles/mods/Dockerfile-8.1 @@ -29,7 +29,7 @@ RUN set -eux \ libkrb5-dev \ libldap2-dev \ libmagickwand-dev \ - libmariadbclient-dev \ + libmariadb-dev \ libmemcached-dev \ libpcre3-dev \ libpng-dev \ @@ -789,7 +789,7 @@ RUN set -eux \ libicu67 \ libjpeg62-turbo \ libmagickwand-6.q16-6 \ - libmariadbclient18 \ + libmariadbd19 \ libmemcachedutil2 \ libpng16-16 \ libpq5 \ diff --git a/Dockerfiles/mods/Dockerfile-8.2 b/Dockerfiles/mods/Dockerfile-8.2 index fb627257..fea7a3c8 100644 --- a/Dockerfiles/mods/Dockerfile-8.2 +++ b/Dockerfiles/mods/Dockerfile-8.2 @@ -29,7 +29,7 @@ RUN set -eux \ libkrb5-dev \ libldap2-dev \ libmagickwand-dev \ - libmariadbclient-dev \ + libmariadb-dev \ libmemcached-dev \ libpcre3-dev \ libpng-dev \ @@ -778,7 +778,7 @@ RUN set -eux \ libicu67 \ libjpeg62-turbo \ libmagickwand-6.q16-6 \ - libmariadbclient18 \ + libmariadbd19 \ libmemcachedutil2 \ libpng16-16 \ libpq5 \ diff --git a/build/ansible/group_vars/all/mods.yml b/build/ansible/group_vars/all/mods.yml index ae79b15b..cbe4194c 100644 --- a/build/ansible/group_vars/all/mods.yml +++ b/build/ansible/group_vars/all/mods.yml @@ -657,27 +657,15 @@ extensions_available: type: pecl mysql: disabled: [7.0, 7.1, 7.2, 7.3, 7.4, 8.0, 8.1, 8.2] # Deprecated in newer versions - 5.2: - type: builtin - run_dep: [libmysqlclient18] - build_dep: [libmysqlclient-dev] - 5.3: - type: builtin - run_dep: [libmysqlclient18] - build_dep: [libmysqlclient-dev] - 5.4: - type: builtin - run_dep: [libmysqlclient18] - build_dep: [libmysqlclient-dev] - 5.5: + 5.6: type: builtin - run_dep: [libmysqlclient18] - build_dep: [libmysqlclient-dev] + run_dep: [libmariadbclient18] + build_dep: [libmariadbclient-dev] all: type: builtin configure: --with-mysql --with-mysql-sock --with-zlib-dir=/usr --with-libdir="/lib/$(dpkg-architecture --query DEB_BUILD_MULTIARCH)" - run_dep: [libmariadbclient18] - build_dep: [libmariadbclient-dev] + run_dep: [libmysqlclient18] + build_dep: [libmysqlclient-dev] mysqli: 5.2: type: builtin @@ -695,10 +683,14 @@ extensions_available: type: builtin run_dep: [libmysqlclient18] build_dep: [libmysqlclient-dev] - all: + 5.6: type: builtin run_dep: [libmariadbclient18] build_dep: [libmariadbclient-dev] + all: + type: builtin + run_dep: [libmariadbd19] + build_dep: [libmariadb-dev] mysqlnd: disabled: [5.2] already_avail: [5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3, 7.4, 8.0, 8.1, 8.2] @@ -812,11 +804,15 @@ extensions_available: type: builtin run_dep: [libmysqlclient18] build_dep: [zlib1g-dev, libmysqlclient-dev] - all: + 5.6: type: builtin - configure: --with-zlib-dir=/usr run_dep: [libmariadbclient18] build_dep: [zlib1g-dev, libmariadbclient-dev] + all: + type: builtin + configure: --with-zlib-dir=/usr + run_dep: [libmariadbd19] + build_dep: [zlib1g-dev, libmariadb-dev] pdo_oci: disabled: [5.2, 5.3, 5.4, 5.5, 5.6] 7.2: @@ -1161,6 +1157,7 @@ extensions_available: 5.5: type: pecl version: 1.9.23 + run_dep: [libnghttp2-5] 5.6: type: pecl version: 1.9.23 diff --git a/build/ansible/group_vars/all/work.yml b/build/ansible/group_vars/all/work.yml index abd4e91a..7ff367dc 100644 --- a/build/ansible/group_vars/all/work.yml +++ b/build/ansible/group_vars/all/work.yml @@ -167,6 +167,7 @@ apt_repositories_available: # gpg --dry-run --with-fingerprint < <(curl https://www.mongodb.org/static/pgp/server-3.6.asc) | grep fingerprint | sed 's/.*=//g' | sed 's/ //g' mongo: 5.2: + # gpg --dry-run --with-fingerprint < <(curl https://www.mongodb.org/static/pgp/server-3.6.asc) | grep fingerprint | sed 's/.*=//g' | sed 's/ //g' deb: deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main key: 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 5.3: @@ -179,6 +180,7 @@ apt_repositories_available: deb: deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main key: 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 all: + # gpg --dry-run --with-fingerprint < <(curl https://www.mongodb.org/static/pgp/server-4.0.asc) | grep fingerprint | sed 's/.*=//g' | sed 's/ //g' deb: deb http://repo.mongodb.org/apt/debian stretch/mongodb-org/4.0 main key: 9DA31620334BD75D9DCB49F368818C72E52529D4 pgsql: From 4e5da07e21f994be79e82768da1cb000c7c757ad Mon Sep 17 00:00:00 2001 From: cytopia Date: Mon, 21 Mar 2022 15:21:24 +0100 Subject: [PATCH 11/19] Make install of symfony cli platform independent --- Dockerfiles/work/Dockerfile-5.4 | 2 +- Dockerfiles/work/Dockerfile-5.5 | 2 +- Dockerfiles/work/Dockerfile-5.6 | 2 +- Dockerfiles/work/Dockerfile-7.0 | 2 +- Dockerfiles/work/Dockerfile-7.1 | 2 +- Dockerfiles/work/Dockerfile-7.2 | 2 +- Dockerfiles/work/Dockerfile-7.3 | 2 +- Dockerfiles/work/Dockerfile-7.4 | 2 +- Dockerfiles/work/Dockerfile-8.0 | 2 +- Dockerfiles/work/Dockerfile-8.1 | 2 +- Dockerfiles/work/Dockerfile-8.2 | 2 +- build/ansible/group_vars/all/work.yml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index 6de4ed97..78f96972 100644 --- a/Dockerfiles/work/Dockerfile-5.4 +++ b/Dockerfiles/work/Dockerfile-5.4 @@ -343,7 +343,7 @@ RUN set -eux \ \ # -------------------- symfony -------------------- && SYMFONY_VERSION="$( curl -sS -L --fail https://get.symfony.com/cli/LATEST )" \ - && curl -sS -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_amd64" > /usr/local/bin/symfony \ + && curl -sS -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_$(dpkg-architecture --query DEB_HOST_ARCH)" > /usr/local/bin/symfony \ && chmod +x /usr/local/bin/symfony \ \ # -------------------- wkhtmltopdf -------------------- diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index 2a075bcf..cd71505a 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -349,7 +349,7 @@ RUN set -eux \ \ # -------------------- symfony -------------------- && SYMFONY_VERSION="$( curl -sS -L --fail https://get.symfony.com/cli/LATEST )" \ - && curl -sS -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_amd64" > /usr/local/bin/symfony \ + && curl -sS -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_$(dpkg-architecture --query DEB_HOST_ARCH)" > /usr/local/bin/symfony \ && chmod +x /usr/local/bin/symfony \ \ # -------------------- wkhtmltopdf -------------------- diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index 380e6b3e..a5e5a4c9 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -365,7 +365,7 @@ RUN set -eux \ \ # -------------------- symfony -------------------- && SYMFONY_VERSION="$( curl -sS -L --fail https://get.symfony.com/cli/LATEST )" \ - && curl -sS -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_amd64" > /usr/local/bin/symfony \ + && curl -sS -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_$(dpkg-architecture --query DEB_HOST_ARCH)" > /usr/local/bin/symfony \ && chmod +x /usr/local/bin/symfony \ \ # -------------------- wkhtmltopdf -------------------- diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index 9fd7bf51..a71c7fe9 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -346,7 +346,7 @@ RUN set -eux \ \ # -------------------- symfony -------------------- && SYMFONY_VERSION="$( curl -sS -L --fail https://get.symfony.com/cli/LATEST )" \ - && curl -sS -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_amd64" > /usr/local/bin/symfony \ + && curl -sS -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_$(dpkg-architecture --query DEB_HOST_ARCH)" > /usr/local/bin/symfony \ && chmod +x /usr/local/bin/symfony \ \ # -------------------- wkhtmltopdf -------------------- diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index 6d3fb2af..02972532 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -345,7 +345,7 @@ RUN set -eux \ \ # -------------------- symfony -------------------- && SYMFONY_VERSION="$( curl -sS -L --fail https://get.symfony.com/cli/LATEST )" \ - && curl -sS -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_amd64" > /usr/local/bin/symfony \ + && curl -sS -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_$(dpkg-architecture --query DEB_HOST_ARCH)" > /usr/local/bin/symfony \ && chmod +x /usr/local/bin/symfony \ \ # -------------------- wkhtmltopdf -------------------- diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index 8643e06b..77224d09 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -365,7 +365,7 @@ RUN set -eux \ \ # -------------------- symfony -------------------- && SYMFONY_VERSION="$( curl -sS -L --fail https://get.symfony.com/cli/LATEST )" \ - && curl -sS -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_amd64" > /usr/local/bin/symfony \ + && curl -sS -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_$(dpkg-architecture --query DEB_HOST_ARCH)" > /usr/local/bin/symfony \ && chmod +x /usr/local/bin/symfony \ \ # -------------------- wkhtmltopdf -------------------- diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index 64580555..6256b720 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -366,7 +366,7 @@ RUN set -eux \ \ # -------------------- symfony -------------------- && SYMFONY_VERSION="$( curl -sS -L --fail https://get.symfony.com/cli/LATEST )" \ - && curl -sS -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_amd64" > /usr/local/bin/symfony \ + && curl -sS -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_$(dpkg-architecture --query DEB_HOST_ARCH)" > /usr/local/bin/symfony \ && chmod +x /usr/local/bin/symfony \ \ # -------------------- wkhtmltopdf -------------------- diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4 index 6d7efbab..e7f7d236 100644 --- a/Dockerfiles/work/Dockerfile-7.4 +++ b/Dockerfiles/work/Dockerfile-7.4 @@ -366,7 +366,7 @@ RUN set -eux \ \ # -------------------- symfony -------------------- && SYMFONY_VERSION="$( curl -sS -L --fail https://get.symfony.com/cli/LATEST )" \ - && curl -sS -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_amd64" > /usr/local/bin/symfony \ + && curl -sS -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_$(dpkg-architecture --query DEB_HOST_ARCH)" > /usr/local/bin/symfony \ && chmod +x /usr/local/bin/symfony \ \ # -------------------- wkhtmltopdf -------------------- diff --git a/Dockerfiles/work/Dockerfile-8.0 b/Dockerfiles/work/Dockerfile-8.0 index 8fbcb6d1..fdc894d5 100644 --- a/Dockerfiles/work/Dockerfile-8.0 +++ b/Dockerfiles/work/Dockerfile-8.0 @@ -300,7 +300,7 @@ RUN set -eux \ \ # -------------------- symfony -------------------- && SYMFONY_VERSION="$( curl -sS -L --fail https://get.symfony.com/cli/LATEST )" \ - && curl -sS -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_amd64" > /usr/local/bin/symfony \ + && curl -sS -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_$(dpkg-architecture --query DEB_HOST_ARCH)" > /usr/local/bin/symfony \ && chmod +x /usr/local/bin/symfony \ \ # -------------------- wkhtmltopdf -------------------- diff --git a/Dockerfiles/work/Dockerfile-8.1 b/Dockerfiles/work/Dockerfile-8.1 index ecbb426c..84b178de 100644 --- a/Dockerfiles/work/Dockerfile-8.1 +++ b/Dockerfiles/work/Dockerfile-8.1 @@ -300,7 +300,7 @@ RUN set -eux \ \ # -------------------- symfony -------------------- && SYMFONY_VERSION="$( curl -sS -L --fail https://get.symfony.com/cli/LATEST )" \ - && curl -sS -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_amd64" > /usr/local/bin/symfony \ + && curl -sS -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_$(dpkg-architecture --query DEB_HOST_ARCH)" > /usr/local/bin/symfony \ && chmod +x /usr/local/bin/symfony \ \ # -------------------- wkhtmltopdf -------------------- diff --git a/Dockerfiles/work/Dockerfile-8.2 b/Dockerfiles/work/Dockerfile-8.2 index 6d763701..782152c3 100644 --- a/Dockerfiles/work/Dockerfile-8.2 +++ b/Dockerfiles/work/Dockerfile-8.2 @@ -284,7 +284,7 @@ RUN set -eux \ \ # -------------------- symfony -------------------- && SYMFONY_VERSION="$( curl -sS -L --fail https://get.symfony.com/cli/LATEST )" \ - && curl -sS -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_amd64" > /usr/local/bin/symfony \ + && curl -sS -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_$(dpkg-architecture --query DEB_HOST_ARCH)" > /usr/local/bin/symfony \ && chmod +x /usr/local/bin/symfony \ \ # -------------------- wkhtmltopdf -------------------- diff --git a/build/ansible/group_vars/all/work.yml b/build/ansible/group_vars/all/work.yml index 7ff367dc..1e01e7f5 100644 --- a/build/ansible/group_vars/all/work.yml +++ b/build/ansible/group_vars/all/work.yml @@ -945,7 +945,7 @@ software_available: check: symfony -V | grep -Ei 'version\s*.*v[0-9][.0-9]+' all: pre: SYMFONY_VERSION="$( curl -sS -L --fail https://get.symfony.com/cli/LATEST )" - command: curl -sS -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_amd64" > /usr/local/bin/symfony + command: curl -sS -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_$(dpkg-architecture --query DEB_HOST_ARCH)" > /usr/local/bin/symfony post: chmod +x /usr/local/bin/symfony wkhtmltopdf: check: wkhtmltopdf --version | grep -E "^wkhtmltopdf [0-9][.0-9]+\s+\(.+patched.+\)" From 0181f196f6f9e507e9e88508700d7507b0e8e8f3 Mon Sep 17 00:00:00 2001 From: cytopia Date: Mon, 21 Mar 2022 15:23:33 +0100 Subject: [PATCH 12/19] Update module section --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 90a28472..9d50be14 100644 --- a/README.md +++ b/README.md @@ -664,7 +664,7 @@ Check out this table to see which Docker image provides what PHP modules. 5.3 Core, ctype, curl, date, dom, ereg, fileinfo, filter, hash, iconv, json, libxml, mysql, mysqlnd, openssl, pcre, PDO, pdo_sqlite, Phar, posix, readline, recode, Reflection, session, SimpleXML, SPL, SQLite, sqlite3, standard, tokenizer, xml, xmlreader, xmlwriter, zlib - apc, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, ereg, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imap, interbase, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongo, msgpack, mysql, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pgsql, phalcon, Phar, posix, pspell, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, SPL, SQLite, sqlite3, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, uuid, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib + amqp, apc, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, ereg, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imap, interbase, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongo, msgpack, mysql, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pgsql, phalcon, Phar, posix, pspell, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, SPL, SQLite, sqlite3, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, uuid, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib 5.4 From 06ac183215681a5f7d464471a46ddeb8eef58ec3 Mon Sep 17 00:00:00 2001 From: cytopia Date: Mon, 21 Mar 2022 15:39:26 +0100 Subject: [PATCH 13/19] Fix build for PHP 7.0 --- Dockerfiles/mods/Dockerfile-7.0 | 12 +++++++----- build/ansible/group_vars/all/mods.yml | 8 ++++++++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Dockerfiles/mods/Dockerfile-7.0 b/Dockerfiles/mods/Dockerfile-7.0 index 7b17e3cd..1134290f 100644 --- a/Dockerfiles/mods/Dockerfile-7.0 +++ b/Dockerfiles/mods/Dockerfile-7.0 @@ -38,7 +38,7 @@ RUN set -eux \ libmagick++-dev \ libmagickcore-6.q16-dev \ libmagickwand-dev \ - libmariadb-dev \ + libmariadbclient-dev \ libmcrypt-dev \ libmemcached-dev \ libnghttp2-dev \ @@ -369,8 +369,9 @@ RUN set -eux \ # -------------------- Installing PHP Extension: mysqli -------------------- RUN set -eux \ - # Installation: Generic + # Installation: Version specific # Type: Built-in extension + # Installation && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysqli \ && true @@ -461,10 +462,11 @@ RUN set -eux \ # -------------------- Installing PHP Extension: pdo_mysql -------------------- RUN set -eux \ - # Installation: Generic + # Installation: Version specific # Type: Built-in extension - # Custom: configure command + # Default: configure command && docker-php-ext-configure pdo_mysql --with-zlib-dir=/usr \ + # Installation && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_mysql \ && true @@ -905,7 +907,7 @@ RUN set -eux \ libmagickcore-6.q16-3-extra \ libmagickwand-6.q16-3 \ libmagickwand-6.q16hdri-3 \ - libmariadbd19 \ + libmariadbclient18 \ libmcrypt4 \ libmemcachedutil2 \ libnghttp2-14 \ diff --git a/build/ansible/group_vars/all/mods.yml b/build/ansible/group_vars/all/mods.yml index cbe4194c..7d6cea40 100644 --- a/build/ansible/group_vars/all/mods.yml +++ b/build/ansible/group_vars/all/mods.yml @@ -687,6 +687,10 @@ extensions_available: type: builtin run_dep: [libmariadbclient18] build_dep: [libmariadbclient-dev] + 7.0: + type: builtin + run_dep: [libmariadbclient18] + build_dep: [libmariadbclient-dev] all: type: builtin run_dep: [libmariadbd19] @@ -808,6 +812,10 @@ extensions_available: type: builtin run_dep: [libmariadbclient18] build_dep: [zlib1g-dev, libmariadbclient-dev] + 7.0: + type: builtin + run_dep: [libmariadbclient18] + build_dep: [zlib1g-dev, libmariadbclient-dev] all: type: builtin configure: --with-zlib-dir=/usr From e97261bc87b3ce130f0765dbd8ed444a6959a2ca Mon Sep 17 00:00:00 2001 From: cytopia Date: Mon, 21 Mar 2022 16:18:48 +0100 Subject: [PATCH 14/19] Update PHP modules in README --- README.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 9d50be14..a332e843 100644 --- a/README.md +++ b/README.md @@ -658,23 +658,23 @@ Check out this table to see which Docker image provides what PHP modules. 5.2 - ctype, curl, date, dom, filter, hash, iconv, json, libxml, mbstring, mysql, mysqli, openssl, pcre, PDO, pdo_mysql, pdo_sqlite, posix, readline, Reflection, session, SimpleXML, soap, SPL, SQLite, standard, tokenizer, xml, xmlreader, xmlwriter, zlib - amqp, bcmath, bz2, calendar, ctype, curl, date, dba, dom, enchant, exif, fileinfo, filter, ftp, gd, gettext, hash, iconv, igbinary, imap, interbase, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongo, msgpack, mysql, mysqli, OAuth, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pgsql, Phar, posix, pspell, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, SPL, SQLite, standard, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib + ctype, curl, date, dom, filter, ftp, hash, iconv, json, libxml, mbstring, mhash, openssl, pcre, PDO, pdo_sqlite, posix, readline, recode, Reflection, session, SimpleXML, SPL, SQLite, standard, tokenizer, xml, xmlreader, xmlwriter, zlib + amqp, bcmath, bz2, calendar, ctype, curl, date, dba, dom, enchant, exif, fileinfo, filter, ftp, gd, gettext, hash, iconv, igbinary, imap, interbase, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mhash, mongo, msgpack, mysql, mysqli, OAuth, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pgsql, Phar, posix, pspell, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, SPL, SQLite, standard, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib 5.3 - Core, ctype, curl, date, dom, ereg, fileinfo, filter, hash, iconv, json, libxml, mysql, mysqlnd, openssl, pcre, PDO, pdo_sqlite, Phar, posix, readline, recode, Reflection, session, SimpleXML, SPL, SQLite, sqlite3, standard, tokenizer, xml, xmlreader, xmlwriter, zlib - amqp, apc, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, ereg, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imap, interbase, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongo, msgpack, mysql, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pgsql, phalcon, Phar, posix, pspell, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, SPL, SQLite, sqlite3, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, uuid, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib + Core, ctype, curl, date, dom, ereg, fileinfo, filter, ftp, hash, iconv, json, libxml, mbstring, mhash, mysqlnd, openssl, pcre, PDO, pdo_sqlite, Phar, posix, readline, recode, Reflection, session, SimpleXML, SPL, SQLite, sqlite3, standard, tokenizer, xml, xmlreader, xmlwriter, zlib< + amqp, apc, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, ereg, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imap, interbase, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mhash, mongo, mongodb, msgpack, mysql, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pgsql, phalcon, Phar, posix, pspell, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, SPL, SQLite, sqlite3, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, uuid, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib 5.4 - Core, ctype, curl, date, dom, ereg, fileinfo, filter, hash, iconv, json, libxml, mysqlnd, openssl, pcre, PDO, pdo_sqlite, Phar, posix, readline, recode, Reflection, session, SimpleXML, SPL, sqlite3, standard, tokenizer, xml, xmlreader, xmlwriter, zlib - amqp, apc, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, ereg, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imap, interbase, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongo, mongodb, msgpack, mysql, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pgsql, phalcon, Phar, posix, pspell, psr, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, SPL, sqlite3, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, uuid, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib + Core, ctype, curl, date, dom, ereg, fileinfo, filter, ftp, hash, iconv, json, libxml, mbstring, mhash, mysqlnd, openssl, pcre, PDO, pdo_sqlite, Phar, posix, readline, recode, Reflection, session, SimpleXML, SPL, sqlite3, standard, tokenizer, xml, xmlreader, xmlwriter, zlib + amqp, apc, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, ereg, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imap, interbase, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mhash, mongo, mongodb, msgpack, mysql, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pgsql, phalcon, Phar, posix, pspell, psr, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, SPL, sqlite3, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, uuid, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib 5.5 - Core, ctype, curl, date, dom, ereg, fileinfo, filter, ftp, hash, iconv, json, libxml, mbstring, mysqlnd, openssl, pcre, PDO, pdo_sqlite, Phar, posix, readline, Reflection, session, SimpleXML, SPL, sqlite3, standard, tokenizer, xml, xmlreader, xmlwriter, zlib - amqp, apc, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, ereg, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, interbase, intl, ioncube, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongo, mongodb, msgpack, mysql, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pgsql, phalcon, Phar, posix, pspell, psr, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, SPL, sqlite3, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, uuid, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib + Core, ctype, curl, date, dom, ereg, fileinfo, filter, ftp, hash, iconv, json, libxml, mbstring, mhash, mysqlnd, openssl, pcre, PDO, pdo_sqlite, Phar, posix, readline, recode, Reflection, session, SimpleXML, SPL, sqlite3, standard, tokenizer, xml, xmlreader, xmlwriter, zlib + amqp, apc, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, ereg, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, interbase, intl, ioncube, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mhash, mongo, mongodb, msgpack, mysql, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pgsql, phalcon, Phar, posix, pspell, psr, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, SPL, sqlite3, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, uuid, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib 5.6 From 6a00f19e88410bfea353d5aa0655d239150fc8fc Mon Sep 17 00:00:00 2001 From: cytopia Date: Mon, 21 Mar 2022 16:22:06 +0100 Subject: [PATCH 15/19] Fix snmp module for PHP 7.4 --- Dockerfiles/mods/Dockerfile-7.4 | 4 ++-- build/ansible/group_vars/all/mods.yml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfiles/mods/Dockerfile-7.4 b/Dockerfiles/mods/Dockerfile-7.4 index d8aedb8d..11d1e036 100644 --- a/Dockerfiles/mods/Dockerfile-7.4 +++ b/Dockerfiles/mods/Dockerfile-7.4 @@ -611,8 +611,8 @@ RUN set -eux \ RUN set -eux \ # Installation: Version specific # Type: Built-in extension - # Default: configure command - && docker-php-ext-configure snmp --with-openssl-dir \ + # Custom: configure command + && docker-php-ext-configure snmp --with-snmp \ # Installation && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) snmp \ && true diff --git a/build/ansible/group_vars/all/mods.yml b/build/ansible/group_vars/all/mods.yml index 7d6cea40..53b9e3bd 100644 --- a/build/ansible/group_vars/all/mods.yml +++ b/build/ansible/group_vars/all/mods.yml @@ -1081,6 +1081,7 @@ extensions_available: snmp: 7.4: type: builtin + configure: --with-snmp build_dep: [libssl-dev, libsnmp-dev, snmp] run_dep: [snmp] all: From 8318b43d2f4ae4ab918623906117c3364ac51490 Mon Sep 17 00:00:00 2001 From: cytopia Date: Mon, 21 Mar 2022 16:31:17 +0100 Subject: [PATCH 16/19] Ensure to check against mhash module --- Dockerfiles/mods/Dockerfile-5.2 | 2 ++ Dockerfiles/mods/Dockerfile-5.3 | 2 ++ Dockerfiles/mods/Dockerfile-5.4 | 2 ++ Dockerfiles/mods/Dockerfile-5.5 | 2 ++ Dockerfiles/mods/Dockerfile-5.6 | 2 ++ build/ansible/group_vars/all/mods.yml | 4 ++++ 6 files changed, 14 insertions(+) diff --git a/Dockerfiles/mods/Dockerfile-5.2 b/Dockerfiles/mods/Dockerfile-5.2 index 6d61575d..15dfc8bd 100644 --- a/Dockerfiles/mods/Dockerfile-5.2 +++ b/Dockerfiles/mods/Dockerfile-5.2 @@ -708,6 +708,8 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^memcache$' \ && php -m | grep -oiE '^memcached$' \ && php-fpm -m | grep -oiE '^memcached$' \ + && php -m | grep -oiE '^mhash$' \ + && php-fpm -m | grep -oiE '^mhash$' \ && php -m | grep -oiE '^mongo$' \ && php-fpm -m | grep -oiE '^mongo$' \ && php -m | grep -oiE '^mysql$' \ diff --git a/Dockerfiles/mods/Dockerfile-5.3 b/Dockerfiles/mods/Dockerfile-5.3 index 73afd676..ea72b33e 100644 --- a/Dockerfiles/mods/Dockerfile-5.3 +++ b/Dockerfiles/mods/Dockerfile-5.3 @@ -835,6 +835,8 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^memcache$' \ && php -m | grep -oiE '^memcached$' \ && php-fpm -m | grep -oiE '^memcached$' \ + && php -m | grep -oiE '^mhash$' \ + && php-fpm -m | grep -oiE '^mhash$' \ && php -m | grep -oiE '^mongo$' \ && php-fpm -m | grep -oiE '^mongo$' \ && php -m | grep -oiE '^mongodb$' \ diff --git a/Dockerfiles/mods/Dockerfile-5.4 b/Dockerfiles/mods/Dockerfile-5.4 index 0ec0cada..2a3480e2 100644 --- a/Dockerfiles/mods/Dockerfile-5.4 +++ b/Dockerfiles/mods/Dockerfile-5.4 @@ -846,6 +846,8 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^memcache$' \ && php -m | grep -oiE '^memcached$' \ && php-fpm -m | grep -oiE '^memcached$' \ + && php -m | grep -oiE '^mhash$' \ + && php-fpm -m | grep -oiE '^mhash$' \ && php -m | grep -oiE '^mongo$' \ && php-fpm -m | grep -oiE '^mongo$' \ && php -m | grep -oiE '^mongodb$' \ diff --git a/Dockerfiles/mods/Dockerfile-5.5 b/Dockerfiles/mods/Dockerfile-5.5 index 16c3e068..d4b15e2e 100644 --- a/Dockerfiles/mods/Dockerfile-5.5 +++ b/Dockerfiles/mods/Dockerfile-5.5 @@ -899,6 +899,8 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^memcache$' \ && php -m | grep -oiE '^memcached$' \ && php-fpm -m | grep -oiE '^memcached$' \ + && php -m | grep -oiE '^mhash$' \ + && php-fpm -m | grep -oiE '^mhash$' \ && php -m | grep -oiE '^mongo$' \ && php-fpm -m | grep -oiE '^mongo$' \ && php -m | grep -oiE '^mongodb$' \ diff --git a/Dockerfiles/mods/Dockerfile-5.6 b/Dockerfiles/mods/Dockerfile-5.6 index ca2f6045..4fb45ddb 100644 --- a/Dockerfiles/mods/Dockerfile-5.6 +++ b/Dockerfiles/mods/Dockerfile-5.6 @@ -918,6 +918,8 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^memcache$' \ && php -m | grep -oiE '^memcached$' \ && php-fpm -m | grep -oiE '^memcached$' \ + && php -m | grep -oiE '^mhash$' \ + && php-fpm -m | grep -oiE '^mhash$' \ && php -m | grep -oiE '^mongo$' \ && php-fpm -m | grep -oiE '^mongo$' \ && php -m | grep -oiE '^mongodb$' \ diff --git a/build/ansible/group_vars/all/mods.yml b/build/ansible/group_vars/all/mods.yml index 53b9e3bd..f871001c 100644 --- a/build/ansible/group_vars/all/mods.yml +++ b/build/ansible/group_vars/all/mods.yml @@ -49,6 +49,7 @@ extensions_enabled: - memcache # requires igbinary and msgpack to be installed - memcached + - mhash - mongo - mongodb - mysql @@ -605,6 +606,9 @@ extensions_available: type: pecl build_dep: [zlib1g-dev, libmemcached-dev, libevent-dev] run_dep: [libmemcachedutil2] + mhash: + disabled: [7.0, 7.1, 7.2, 7.3, 7.4, 8.0, 8.1, 8.2] # Deprecated + already_avail: [5.2, 5.3, 5.4, 5.5, 5.6] mongo: disabled: [7.0, 7.1, 7.2, 7.3, 7.4, 8.0, 8.1, 8.2] # Deprecated 5.2: From 7f71dd2493bc0d757da203006584351e3ccfbf1a Mon Sep 17 00:00:00 2001 From: cytopia Date: Mon, 21 Mar 2022 19:14:43 +0100 Subject: [PATCH 17/19] Update PHP modules in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a332e843..8b653025 100644 --- a/README.md +++ b/README.md @@ -663,7 +663,7 @@ Check out this table to see which Docker image provides what PHP modules. 5.3 - Core, ctype, curl, date, dom, ereg, fileinfo, filter, ftp, hash, iconv, json, libxml, mbstring, mhash, mysqlnd, openssl, pcre, PDO, pdo_sqlite, Phar, posix, readline, recode, Reflection, session, SimpleXML, SPL, SQLite, sqlite3, standard, tokenizer, xml, xmlreader, xmlwriter, zlib< + Core, ctype, curl, date, dom, ereg, fileinfo, filter, ftp, hash, iconv, json, libxml, mbstring, mhash, mysqlnd, openssl, pcre, PDO, pdo_sqlite, Phar, posix, readline, recode, Reflection, session, SimpleXML, SPL, SQLite, sqlite3, standard, tokenizer, xml, xmlreader, xmlwriter, zlib amqp, apc, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, ereg, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imap, interbase, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mhash, mongo, mongodb, msgpack, mysql, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pgsql, phalcon, Phar, posix, pspell, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, SPL, SQLite, sqlite3, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, uuid, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib From 896c8f6c804051142be6211300b543a528298fc2 Mon Sep 17 00:00:00 2001 From: cytopia Date: Mon, 21 Mar 2022 19:15:03 +0100 Subject: [PATCH 18/19] Fix soap module build for PHP 7.4 --- Dockerfiles/mods/Dockerfile-7.4 | 4 ++-- build/ansible/group_vars/all/mods.yml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfiles/mods/Dockerfile-7.4 b/Dockerfiles/mods/Dockerfile-7.4 index 11d1e036..fe9f1fb3 100644 --- a/Dockerfiles/mods/Dockerfile-7.4 +++ b/Dockerfiles/mods/Dockerfile-7.4 @@ -622,8 +622,8 @@ RUN set -eux \ RUN set -eux \ # Installation: Version specific # Type: Built-in extension - # Default: configure command - && docker-php-ext-configure soap --with-libxml-dir=/usr \ + # Custom: configure command + && docker-php-ext-configure soap --enable-soap \ # Installation && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) soap \ && true diff --git a/build/ansible/group_vars/all/mods.yml b/build/ansible/group_vars/all/mods.yml index f871001c..e657ba4b 100644 --- a/build/ansible/group_vars/all/mods.yml +++ b/build/ansible/group_vars/all/mods.yml @@ -1096,6 +1096,7 @@ extensions_available: soap: 7.4: type: builtin + configure: --enable-soap all: type: builtin configure: --with-libxml-dir=/usr From abfeef2e5c9f56be8538157f8aaf9c7fc9f1b64a Mon Sep 17 00:00:00 2001 From: cytopia Date: Mon, 21 Mar 2022 22:15:33 +0100 Subject: [PATCH 19/19] Remove testing files --- .github/workflows/arm64.yml | 352 ------------------------------------ 1 file changed, 352 deletions(-) delete mode 100644 .github/workflows/arm64.yml diff --git a/.github/workflows/arm64.yml b/.github/workflows/arm64.yml deleted file mode 100644 index a72ed903..00000000 --- a/.github/workflows/arm64.yml +++ /dev/null @@ -1,352 +0,0 @@ ---- - -# ------------------------------------------------------------------------------------------------- -# Job Name -# ------------------------------------------------------------------------------------------------- -name: build-arm64 - - -# ------------------------------------------------------------------------------------------------- -# When to run -# ------------------------------------------------------------------------------------------------- -on: - # Runs on Push - push: - - -# ------------------------------------------------------------------------------------------------- -# What to run -# ------------------------------------------------------------------------------------------------- -jobs: - build: - name: "[ PHP-${{ matrix.version }} (arm64) ]" - runs-on: ubuntu-latest - strategy: - fail-fast: False - matrix: - version: - #- '5.2' # No arm64 version available - - '5.3' - - '5.4' - - '5.5' - - '5.6' - - '7.0' - - '7.1' - - '7.2' - - '7.3' - - '7.4' - - '8.0' - - '8.1' - - '8.2' - steps: - - # ------------------------------------------------------------ - # Setup repository - # ------------------------------------------------------------ - - name: Checkout repository - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - - name: Set variables - id: vars - run: | - - # Retrieve git info (tags, etc) - git fetch --all - - # Branch, Tag or Commit - GIT_TYPE="$( \ - curl -sS https://raw.githubusercontent.com/cytopia/git-tools/master/git-info.sh \ - | sh \ - | grep '^GIT_TYPE' \ - | sed 's|.*=||g' \ - )" - # Branch name, Tag name or Commit Hash - GIT_SLUG="$( \ - curl -sS https://raw.githubusercontent.com/cytopia/git-tools/master/git-info.sh \ - | sh \ - | grep '^GIT_NAME' \ - | sed 's|.*=||g' \ - )" - # Docker Tag - if [ "${GIT_TYPE}" = "BRANCH" ] && [ "${GIT_SLUG}" = "master" ]; then - DOCKER_TAG_BASE="${VERSION}-base" - DOCKER_TAG_MODS="${VERSION}-mods" - DOCKER_TAG_PROD="${VERSION}-prod" - DOCKER_TAG_WORK="${VERSION}-work" - else - DOCKER_TAG_BASE="${VERSION}-base-${GIT_SLUG}" - DOCKER_TAG_MODS="${VERSION}-mods-${GIT_SLUG}" - DOCKER_TAG_PROD="${VERSION}-prod-${GIT_SLUG}" - DOCKER_TAG_WORK="${VERSION}-work-${GIT_SLUG}" - fi - - # Output - echo "GIT_TYPE=${GIT_TYPE}" - echo "GIT_SLUG=${GIT_SLUG}" - echo "DOCKER_TAG_BASE=${DOCKER_TAG_BASE}" - echo "DOCKER_TAG_MODS=${DOCKER_TAG_MODS}" - echo "DOCKER_TAG_PROD=${DOCKER_TAG_PROD}" - echo "DOCKER_TAG_WORK=${DOCKER_TAG_WORK}" - - # Export variable - # https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-commands-for-github-actions#environment-files - echo "GIT_TYPE=${GIT_TYPE}" >> ${GITHUB_ENV} - echo "GIT_SLUG=${GIT_SLUG}" >> ${GITHUB_ENV} - echo "DOCKER_TAG_BASE=${DOCKER_TAG_BASE}" >> ${GITHUB_ENV} - echo "DOCKER_TAG_MODS=${DOCKER_TAG_MODS}" >> ${GITHUB_ENV} - echo "DOCKER_TAG_PROD=${DOCKER_TAG_PROD}" >> ${GITHUB_ENV} - echo "DOCKER_TAG_WORK=${DOCKER_TAG_WORK}" >> ${GITHUB_ENV} - env: - VERSION: ${{ matrix.version }} - - - name: "[SETUP] Setup QEMU environment" - uses: docker/setup-qemu-action@v1 - with: - image: tonistiigi/binfmt:latest - platforms: all - - - # ------------------------------------------------------------ - # Base - # ------------------------------------------------------------ - - name: Build Base - run: | - retry() { - for n in $(seq ${RETRIES}); do - echo "[${n}/${RETRIES}] ${*}"; - if eval "${*}"; then - echo "[SUCC] ${n}/${RETRIES}"; - return 0; - fi; - sleep ${PAUSE}; - echo "[FAIL] ${n}/${RETRIES}"; - done; - return 1; - } - retry make _pull-base-image VERSION=${VERSION} ARCH=linux/arm64 - retry make build-base VERSION=${VERSION} ARCH=linux/arm64 - env: - VERSION: ${{ matrix.version }} - RETRIES: 20 - PAUSE: 10 - - - name: Test Base - run: | - retry() { - for n in $(seq ${RETRIES}); do - echo "[${n}/${RETRIES}] ${*}"; - if eval "${*}"; then - echo "[SUCC] ${n}/${RETRIES}"; - return 0; - fi; - sleep ${PAUSE}; - echo "[FAIL] ${n}/${RETRIES}"; - done; - return 1; - } - #retry make test-base VERSION=${VERSION} ARCH=linux/arm64 - env: - VERSION: ${{ matrix.version }} - RETRIES: 20 - PAUSE: 10 - - - # ------------------------------------------------------------ - # Mods - # ------------------------------------------------------------ - - name: Build Mods - run: | - retry() { - for n in $(seq ${RETRIES}); do - echo "[${n}/${RETRIES}] ${*}"; - if eval "${*}"; then - echo "[SUCC] ${n}/${RETRIES}"; - return 0; - fi; - sleep ${PAUSE}; - echo "[FAIL] ${n}/${RETRIES}"; - done; - return 1; - } - retry make build-mods VERSION=${VERSION} ARCH=linux/arm64 - env: - VERSION: ${{ matrix.version }} - RETRIES: 20 - PAUSE: 10 - - - name: Test Mods - run: | - retry() { - for n in $(seq ${RETRIES}); do - echo "[${n}/${RETRIES}] ${*}"; - if eval "${*}"; then - echo "[SUCC] ${n}/${RETRIES}"; - return 0; - fi; - sleep ${PAUSE}; - echo "[FAIL] ${n}/${RETRIES}"; - done; - return 1; - } - #retry make test-mods VERSION=${VERSION} ARCH=linux/arm64 - env: - VERSION: ${{ matrix.version }} - RETRIES: 20 - PAUSE: 10 - - - # ------------------------------------------------------------ - # Prod - # ------------------------------------------------------------ - - name: Build Prod - run: | - retry() { - for n in $(seq ${RETRIES}); do - echo "[${n}/${RETRIES}] ${*}"; - if eval "${*}"; then - echo "[SUCC] ${n}/${RETRIES}"; - return 0; - fi; - sleep ${PAUSE}; - echo "[FAIL] ${n}/${RETRIES}"; - done; - return 1; - } - retry make build-prod VERSION=${VERSION} ARCH=linux/arm64 - env: - VERSION: ${{ matrix.version }} - RETRIES: 20 - PAUSE: 10 - - - name: Test Prod - run: | - retry() { - for n in $(seq ${RETRIES}); do - echo "[${n}/${RETRIES}] ${*}"; - if eval "${*}"; then - echo "[SUCC] ${n}/${RETRIES}"; - return 0; - fi; - sleep ${PAUSE}; - echo "[FAIL] ${n}/${RETRIES}"; - done; - return 1; - } - #retry make test-prod VERSION=${VERSION} - env: - VERSION: ${{ matrix.version }} - RETRIES: 20 - PAUSE: 10 - - - # ------------------------------------------------------------ - # Work - # ------------------------------------------------------------ - - name: Build Work - run: | - retry() { - for n in $(seq ${RETRIES}); do - echo "[${n}/${RETRIES}] ${*}"; - if eval "${*}"; then - echo "[SUCC] ${n}/${RETRIES}"; - return 0; - fi; - sleep ${PAUSE}; - echo "[FAIL] ${n}/${RETRIES}"; - done; - return 1; - } - retry make build-work VERSION=${VERSION} ARCH=linux/arm64 - env: - VERSION: ${{ matrix.version }} - RETRIES: 20 - PAUSE: 10 - - - name: Test Work - run: | - retry() { - for n in $(seq ${RETRIES}); do - echo "[${n}/${RETRIES}] ${*}"; - if eval "${*}"; then - echo "[SUCC] ${n}/${RETRIES}"; - return 0; - fi; - sleep ${PAUSE}; - echo "[FAIL] ${n}/${RETRIES}"; - done; - return 1; - } - #retry make test-work VERSION=${VERSION} - env: - VERSION: ${{ matrix.version }} - RETRIES: 20 - PAUSE: 10 - - - # ------------------------------------------------------------ - # Diff README.md - # ------------------------------------------------------------ - - name: Diff README.md - run: | - make gen-readme VERSION=${VERSION} - git diff --quiet || { echo "Build Changes"; git diff; git status; false; } - env: - VERSION: ${{ matrix.version }} - - - # ------------------------------------------------------------ - # Deploy - # ------------------------------------------------------------ - #- name: Publish images (only repo owner) - # run: | - # retry() { - # for n in $(seq ${RETRIES}); do - # echo "[${n}/${RETRIES}] ${*}"; - # if eval "${*}"; then - # echo "[SUCC] ${n}/${RETRIES}"; - # return 0; - # fi; - # sleep ${PAUSE}; - # echo "[FAIL] ${n}/${RETRIES}"; - # done; - # return 1; - # } - - # # Output - # echo "GIT_TYPE=${GIT_TYPE}" - # echo "GIT_SLUG=${GIT_SLUG}" - # echo "DOCKER_TAG_BASE=${DOCKER_TAG_BASE}" - # echo "DOCKER_TAG_MODS=${DOCKER_TAG_MODS}" - # echo "DOCKER_TAG_PROD=${DOCKER_TAG_PROD}" - # echo "DOCKER_TAG_WORK=${DOCKER_TAG_WORK}" - - # # Tag image - # retry make tag OLD_TAG="${VERSION}-base" NEW_TAG="${DOCKER_TAG_BASE}" - # retry make tag OLD_TAG="${VERSION}-mods" NEW_TAG="${DOCKER_TAG_MODS}" - # retry make tag OLD_TAG="${VERSION}-prod" NEW_TAG="${DOCKER_TAG_PROD}" - # retry make tag OLD_TAG="${VERSION}-work" NEW_TAG="${DOCKER_TAG_WORK}" - # docker images - - # # Login - # retry make login USERNAME=${{ secrets.DOCKERHUB_USERNAME }} PASSWORD=${{ secrets.DOCKERHUB_PASSWORD }} - - # # Push - # retry make push TAG=${DOCKER_TAG_BASE} - # retry make push TAG=${DOCKER_TAG_MODS} - # retry make push TAG=${DOCKER_TAG_PROD} - # retry make push TAG=${DOCKER_TAG_WORK} - # env: - # VERSION: ${{ matrix.version }} - # RETRIES: 20 - # PAUSE: 10 - # # https://help.github.com/en/github/automating-your-workflow-with-github-actions/contexts-and-expression-syntax-for-github-actions#functions - # if: github.event.pull_request.base.repo.id == github.event.pull_request.head.repo.id - # && ( - # (github.event_name == 'schedule' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/'))) - # || - # (github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/'))) - # || - # (github.event_name == 'push' && startsWith(github.ref, 'refs/heads/release-')) - # )