gh-mirrors/docker-php-fpm
1
0
Fork 0
mirror of https://github.com/devilbox/docker-php-fpm.git synced 2025-12-10 11:01:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix build

Browse Source
This commit is contained in:
cytopia
2022-03-21 14:59:34 +01:00
parent 80f03e7512
commit 6c6470c181
16 changed files with 58 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG.md
View File

@@ -9,9 +9,13 @@
#### Fixed #### Fixed
- Fixed `mongodb-org-shell` and `mongodb-org-tools` install - Fixed `mongodb-org-shell` and `mongodb-org-tools` install
#### Added
- Re-added `mongodb` for PHP 5.3
#### Changed #### 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.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 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 ## Release 0.135

5
Dockerfiles/mods/Dockerfile-5.2
View File

@@ -289,11 +289,10 @@ RUN set -eux \
# -------------------- Installing PHP Extension: mysql -------------------- # -------------------- Installing PHP Extension: mysql --------------------
RUN set -eux \ RUN set -eux \
# Installation: Version specific # Installation: Generic
# Type: Built-in extension # 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)" \ && 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 \ && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysql \
&& true && true

5
Dockerfiles/mods/Dockerfile-5.3
View File

@@ -311,11 +311,10 @@ RUN set -eux \
# -------------------- Installing PHP Extension: mysql -------------------- # -------------------- Installing PHP Extension: mysql --------------------
RUN set -eux \ RUN set -eux \
# Installation: Version specific # Installation: Generic
# Type: Built-in extension # 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)" \ && 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 \ && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysql \
&& true && true

5
Dockerfiles/mods/Dockerfile-5.4
View File

@@ -311,11 +311,10 @@ RUN set -eux \
# -------------------- Installing PHP Extension: mysql -------------------- # -------------------- Installing PHP Extension: mysql --------------------
RUN set -eux \ RUN set -eux \
# Installation: Version specific # Installation: Generic
# Type: Built-in extension # 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)" \ && 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 \ && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysql \
&& true && true

7
Dockerfiles/mods/Dockerfile-5.5
View File

@@ -352,11 +352,10 @@ RUN set -eux \
# -------------------- Installing PHP Extension: mysql -------------------- # -------------------- Installing PHP Extension: mysql --------------------
RUN set -eux \ RUN set -eux \
# Installation: Version specific # Installation: Generic
# Type: Built-in extension # 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)" \ && 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 \ && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysql \
&& true && true
@@ -771,7 +770,7 @@ RUN set -eux \
libmcrypt4 \ libmcrypt4 \
libmemcachedutil2 \ libmemcachedutil2 \
libmysqlclient18 \ libmysqlclient18 \
libnghttp2-14 \ libnghttp2-5 \
libpng12-0 \ libpng12-0 \
libpq5 \ libpq5 \
librabbitmq1 \ librabbitmq1 \

13
Dockerfiles/mods/Dockerfile-5.6
View File

@@ -363,18 +363,20 @@ RUN set -eux \
# -------------------- Installing PHP Extension: mysql -------------------- # -------------------- Installing PHP Extension: mysql --------------------
RUN set -eux \ RUN set -eux \
# Installation: Generic # Installation: Version specific
# Type: Built-in extension # 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)" \ && 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 \ && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysql \
&& true && true
# -------------------- Installing PHP Extension: mysqli -------------------- # -------------------- Installing PHP Extension: mysqli --------------------
RUN set -eux \ RUN set -eux \
# Installation: Generic # Installation: Version specific
# Type: Built-in extension # Type: Built-in extension
# Installation
&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysqli \ && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysqli \
&& true && true
@@ -465,10 +467,11 @@ RUN set -eux \
# -------------------- Installing PHP Extension: pdo_mysql -------------------- # -------------------- Installing PHP Extension: pdo_mysql --------------------
RUN set -eux \ RUN set -eux \
# Installation: Generic # Installation: Version specific
# Type: Built-in extension # Type: Built-in extension
# Custom: configure command # Default: configure command
&& docker-php-ext-configure pdo_mysql --with-zlib-dir=/usr \ && docker-php-ext-configure pdo_mysql --with-zlib-dir=/usr \
# Installation
&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_mysql \ && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_mysql \
&& true && true

4
Dockerfiles/mods/Dockerfile-7.0
View File

@@ -38,7 +38,7 @@ RUN set -eux \
libmagick++-dev \ libmagick++-dev \
libmagickcore-6.q16-dev \ libmagickcore-6.q16-dev \
libmagickwand-dev \ libmagickwand-dev \
libmariadbclient-dev \ libmariadb-dev \
libmcrypt-dev \ libmcrypt-dev \
libmemcached-dev \ libmemcached-dev \
libnghttp2-dev \ libnghttp2-dev \
@@ -905,7 +905,7 @@ RUN set -eux \
libmagickcore-6.q16-3-extra \ libmagickcore-6.q16-3-extra \
libmagickwand-6.q16-3 \ libmagickwand-6.q16-3 \
libmagickwand-6.q16hdri-3 \ libmagickwand-6.q16hdri-3 \
libmariadbclient18 \ libmariadbd19 \
libmcrypt4 \ libmcrypt4 \
libmemcachedutil2 \ libmemcachedutil2 \
libnghttp2-14 \ libnghttp2-14 \

4
Dockerfiles/mods/Dockerfile-7.1
View File

@@ -39,7 +39,7 @@ RUN set -eux \
libmagick++-dev \ libmagick++-dev \
libmagickcore-6.q16-dev \ libmagickcore-6.q16-dev \
libmagickwand-dev \ libmagickwand-dev \
libmariadbclient-dev \ libmariadb-dev \
libmcrypt-dev \ libmcrypt-dev \
libmemcached-dev \ libmemcached-dev \
libnghttp2-dev \ libnghttp2-dev \
@@ -917,7 +917,7 @@ RUN set -eux \
libmagickcore-6.q16-6-extra \ libmagickcore-6.q16-6-extra \
libmagickwand-6.q16-6 \ libmagickwand-6.q16-6 \
libmagickwand-6.q16hdri-6 \ libmagickwand-6.q16hdri-6 \
libmariadbclient18 \ libmariadbd19 \
libmcrypt4 \ libmcrypt4 \
libmemcachedutil2 \ libmemcachedutil2 \
libnghttp2-14 \ libnghttp2-14 \

4
Dockerfiles/mods/Dockerfile-7.2
View File

@@ -39,7 +39,7 @@ RUN set -eux \
libmagick++-dev \ libmagick++-dev \
libmagickcore-6.q16-dev \ libmagickcore-6.q16-dev \
libmagickwand-dev \ libmagickwand-dev \
libmariadbclient-dev \ libmariadb-dev \
libmcrypt-dev \ libmcrypt-dev \
libmemcached-dev \ libmemcached-dev \
libnghttp2-dev \ libnghttp2-dev \
@@ -920,7 +920,7 @@ RUN set -eux \
libmagickcore-6.q16-6-extra \ libmagickcore-6.q16-6-extra \
libmagickwand-6.q16-6 \ libmagickwand-6.q16-6 \
libmagickwand-6.q16hdri-6 \ libmagickwand-6.q16hdri-6 \
libmariadbclient18 \ libmariadbd19 \
libmcrypt4 \ libmcrypt4 \
libmemcachedutil2 \ libmemcachedutil2 \
libnghttp2-14 \ libnghttp2-14 \

4
Dockerfiles/mods/Dockerfile-7.3
View File

@@ -38,7 +38,7 @@ RUN set -eux \
libmagick++-dev \ libmagick++-dev \
libmagickcore-6.q16-dev \ libmagickcore-6.q16-dev \
libmagickwand-dev \ libmagickwand-dev \
libmariadbclient-dev \ libmariadb-dev \
libmcrypt-dev \ libmcrypt-dev \
libmemcached-dev \ libmemcached-dev \
libnghttp2-dev \ libnghttp2-dev \
@@ -909,7 +909,7 @@ RUN set -eux \
libmagickcore-6.q16-6-extra \ libmagickcore-6.q16-6-extra \
libmagickwand-6.q16-6 \ libmagickwand-6.q16-6 \
libmagickwand-6.q16hdri-6 \ libmagickwand-6.q16hdri-6 \
libmariadbclient18 \ libmariadbd19 \
libmcrypt4 \ libmcrypt4 \
libmemcachedutil2 \ libmemcachedutil2 \
libnghttp2-14 \ libnghttp2-14 \

4
Dockerfiles/mods/Dockerfile-7.4
View File

@@ -39,7 +39,7 @@ RUN set -eux \
libmagick++-dev \ libmagick++-dev \
libmagickcore-6.q16-dev \ libmagickcore-6.q16-dev \
libmagickwand-dev \ libmagickwand-dev \
libmariadbclient-dev \ libmariadb-dev \
libmcrypt-dev \ libmcrypt-dev \
libmemcached-dev \ libmemcached-dev \
libnghttp2-dev \ libnghttp2-dev \
@@ -900,7 +900,7 @@ RUN set -eux \
libmagickcore-6.q16-6-extra \ libmagickcore-6.q16-6-extra \
libmagickwand-6.q16-6 \ libmagickwand-6.q16-6 \
libmagickwand-6.q16hdri-6 \ libmagickwand-6.q16hdri-6 \
libmariadbclient18 \ libmariadbd19 \
libmcrypt4 \ libmcrypt4 \
libmemcachedutil2 \ libmemcachedutil2 \
libnghttp2-14 \ libnghttp2-14 \

4
Dockerfiles/mods/Dockerfile-8.0
View File

@@ -28,7 +28,7 @@ RUN set -eux \
libkrb5-dev \ libkrb5-dev \
libldap2-dev \ libldap2-dev \
libmagickwand-dev \ libmagickwand-dev \
libmariadbclient-dev \ libmariadb-dev \
libmcrypt-dev \ libmcrypt-dev \
libmemcached-dev \ libmemcached-dev \
libnghttp2-dev \ libnghttp2-dev \
@@ -813,7 +813,7 @@ RUN set -eux \
libicu67 \ libicu67 \
libjpeg62-turbo \ libjpeg62-turbo \
libmagickwand-6.q16-6 \ libmagickwand-6.q16-6 \
libmariadbclient18 \ libmariadbd19 \
libmcrypt4 \ libmcrypt4 \
libmemcachedutil2 \ libmemcachedutil2 \
libnghttp2-14 \ libnghttp2-14 \

4
Dockerfiles/mods/Dockerfile-8.1
View File

@@ -29,7 +29,7 @@ RUN set -eux \
libkrb5-dev \ libkrb5-dev \
libldap2-dev \ libldap2-dev \
libmagickwand-dev \ libmagickwand-dev \
libmariadbclient-dev \ libmariadb-dev \
libmemcached-dev \ libmemcached-dev \
libpcre3-dev \ libpcre3-dev \
libpng-dev \ libpng-dev \
@@ -789,7 +789,7 @@ RUN set -eux \
libicu67 \ libicu67 \
libjpeg62-turbo \ libjpeg62-turbo \
libmagickwand-6.q16-6 \ libmagickwand-6.q16-6 \
libmariadbclient18 \ libmariadbd19 \
libmemcachedutil2 \ libmemcachedutil2 \
libpng16-16 \ libpng16-16 \
libpq5 \ libpq5 \

4
Dockerfiles/mods/Dockerfile-8.2
View File

@@ -29,7 +29,7 @@ RUN set -eux \
libkrb5-dev \ libkrb5-dev \
libldap2-dev \ libldap2-dev \
libmagickwand-dev \ libmagickwand-dev \
libmariadbclient-dev \ libmariadb-dev \
libmemcached-dev \ libmemcached-dev \
libpcre3-dev \ libpcre3-dev \
libpng-dev \ libpng-dev \
@@ -778,7 +778,7 @@ RUN set -eux \
libicu67 \ libicu67 \
libjpeg62-turbo \ libjpeg62-turbo \
libmagickwand-6.q16-6 \ libmagickwand-6.q16-6 \
libmariadbclient18 \ libmariadbd19 \
libmemcachedutil2 \ libmemcachedutil2 \
libpng16-16 \ libpng16-16 \
libpq5 \ libpq5 \

37
build/ansible/group_vars/all/mods.yml
View File

@@ -657,27 +657,15 @@ extensions_available:
type: pecl type: pecl
mysql: mysql:
disabled: [7.0, 7.1, 7.2, 7.3, 7.4, 8.0, 8.1, 8.2] # Deprecated in newer versions 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 type: builtin
run_dep: [libmysqlclient18] run_dep: [libmariadbclient18]
build_dep: [libmysqlclient-dev] build_dep: [libmariadbclient-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: all:
type: builtin type: builtin
configure: --with-mysql --with-mysql-sock --with-zlib-dir=/usr --with-libdir="/lib/$(dpkg-architecture --query DEB_BUILD_MULTIARCH)" configure: --with-mysql --with-mysql-sock --with-zlib-dir=/usr --with-libdir="/lib/$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"
run_dep: [libmariadbclient18] run_dep: [libmysqlclient18]
build_dep: [libmariadbclient-dev] build_dep: [libmysqlclient-dev]
mysqli: mysqli:
5.2: 5.2:
type: builtin type: builtin
@@ -695,10 +683,14 @@ extensions_available:
type: builtin type: builtin
run_dep: [libmysqlclient18] run_dep: [libmysqlclient18]
build_dep: [libmysqlclient-dev] build_dep: [libmysqlclient-dev]
all: 5.6:
type: builtin type: builtin
run_dep: [libmariadbclient18] run_dep: [libmariadbclient18]
build_dep: [libmariadbclient-dev] build_dep: [libmariadbclient-dev]
all:
type: builtin
run_dep: [libmariadbd19]
build_dep: [libmariadb-dev]
mysqlnd: mysqlnd:
disabled: [5.2] 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] 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 type: builtin
run_dep: [libmysqlclient18] run_dep: [libmysqlclient18]
build_dep: [zlib1g-dev, libmysqlclient-dev] build_dep: [zlib1g-dev, libmysqlclient-dev]
5.6:
type: builtin
run_dep: [libmariadbclient18]
build_dep: [zlib1g-dev, libmariadbclient-dev]
all: all:
type: builtin type: builtin
configure: --with-zlib-dir=/usr configure: --with-zlib-dir=/usr
run_dep: [libmariadbclient18] run_dep: [libmariadbd19]
build_dep: [zlib1g-dev, libmariadbclient-dev] build_dep: [zlib1g-dev, libmariadb-dev]
pdo_oci: pdo_oci:
disabled: [5.2, 5.3, 5.4, 5.5, 5.6] disabled: [5.2, 5.3, 5.4, 5.5, 5.6]
7.2: 7.2:
@@ -1161,6 +1157,7 @@ extensions_available:
5.5: 5.5:
type: pecl type: pecl
version: 1.9.23 version: 1.9.23
run_dep: [libnghttp2-5]
5.6: 5.6:
type: pecl type: pecl
version: 1.9.23 version: 1.9.23

2
build/ansible/group_vars/all/work.yml
View File

@@ -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' # 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: mongo:
5.2: 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 deb: deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main
key: 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 key: 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5
5.3: 5.3:
@@ -179,6 +180,7 @@ apt_repositories_available:
deb: deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main deb: deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main
key: 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 key: 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5
all: 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 deb: deb http://repo.mongodb.org/apt/debian stretch/mongodb-org/4.0 main
key: 9DA31620334BD75D9DCB49F368818C72E52529D4 key: 9DA31620334BD75D9DCB49F368818C72E52529D4
pgsql: pgsql: