From 6c6470c181b2ecf9fe18ea8301ba74a388532150 Mon Sep 17 00:00:00 2001 From: cytopia Date: Mon, 21 Mar 2022 14:59:34 +0100 Subject: [PATCH] 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 889ad89..4519338 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 3081a6e..6d61575 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 5de4a6f..73afd67 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 d6b078d..0ec0cad 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 c6f1fe1..16c3e06 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 19e11c4..ca2f604 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 48d65b7..7b17e3c 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 ead0fb5..1b158b7 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 a11bfae..0357f41 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 24780f7..5d8b34b 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 d424249..d8aedb8 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 1305b5a..a78458a 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 28ba78f..0e062d6 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 fb62725..fea7a3c 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 ae79b15..cbe4194 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: + 5.6: 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] + 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] + 5.6: + type: builtin + run_dep: [libmariadbclient18] + build_dep: [zlib1g-dev, libmariadbclient-dev] all: type: builtin configure: --with-zlib-dir=/usr - run_dep: [libmariadbclient18] - build_dep: [zlib1g-dev, libmariadbclient-dev] + 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 abd4e91..7ff367d 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: