joomla/docker
34
3
Fork 0
mirror of https://github.com/joomla-docker/docker-joomla.git synced 2025-02-13 09:28:24 +00:00
Code Issues Releases Activity

Fix gd extension in 7.4

Browse Source
This commit is contained in:
J0WI 2019-12-03 12:04:16 +01:00
parent 93294783ad
commit ff56867883
12 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile-alpine.template
View File

@ -24,7 +24,7 @@ RUN set -ex; \
postgresql-dev \
; \
\
docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
docker-php-ext-configure gd --with-jpeg; \
docker-php-ext-configure ldap; \
docker-php-ext-install -j "$(nproc)" \
bz2 \

2
Dockerfile-debian.template
View File

@ -20,7 +20,7 @@ RUN set -ex; \
libzip-dev \
; \
\
docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
docker-php-ext-configure gd --with-jpeg; \
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
docker-php-ext-install -j "$(nproc)" \

2
php7.2/apache/Dockerfile
View File

@ -22,7 +22,7 @@ RUN set -ex; \
libpq-dev \
; \
\
docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
docker-php-ext-configure gd --with-jpeg-dir=/usr --with-png-dir=/usr; \
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
docker-php-ext-install -j "$(nproc)" \

2
php7.2/fpm-alpine/Dockerfile
View File

@ -23,7 +23,7 @@ RUN set -ex; \
postgresql-dev \
; \
\
docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
docker-php-ext-configure gd --with-jpeg-dir=/usr --with-png-dir=/usr; \
docker-php-ext-configure ldap; \
docker-php-ext-install -j "$(nproc)" \
bz2 \

2
php7.2/fpm/Dockerfile
View File

@ -19,7 +19,7 @@ RUN set -ex; \
libpq-dev \
; \
\
docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
docker-php-ext-configure gd --with-jpeg-dir=/usr --with-png-dir=/usr; \
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
docker-php-ext-install -j "$(nproc)" \

2
php7.3/apache/Dockerfile
View File

@ -23,7 +23,7 @@ RUN set -ex; \
libzip-dev \
; \
\
docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
docker-php-ext-configure gd --with-jpeg-dir=/usr --with-png-dir=/usr; \
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
docker-php-ext-install -j "$(nproc)" \

2
php7.3/fpm-alpine/Dockerfile
View File

@ -24,7 +24,7 @@ RUN set -ex; \
postgresql-dev \
; \
\
docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
docker-php-ext-configure gd --with-jpeg-dir=/usr --with-png-dir=/usr; \
docker-php-ext-configure ldap; \
docker-php-ext-install -j "$(nproc)" \
bz2 \

2
php7.3/fpm/Dockerfile
View File

@ -20,7 +20,7 @@ RUN set -ex; \
libzip-dev \
; \
\
docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
docker-php-ext-configure gd --with-jpeg-dir=/usr --with-png-dir=/usr; \
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
docker-php-ext-install -j "$(nproc)" \

2
php7.4/apache/Dockerfile
View File

@ -23,7 +23,7 @@ RUN set -ex; \
libzip-dev \
; \
\
docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
docker-php-ext-configure gd --with-jpeg; \
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
docker-php-ext-install -j "$(nproc)" \

2
php7.4/fpm-alpine/Dockerfile
View File

@ -24,7 +24,7 @@ RUN set -ex; \
postgresql-dev \
; \
\
docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
docker-php-ext-configure gd --with-jpeg; \
docker-php-ext-configure ldap; \
docker-php-ext-install -j "$(nproc)" \
bz2 \

2
php7.4/fpm/Dockerfile
View File

@ -20,7 +20,7 @@ RUN set -ex; \
libzip-dev \
; \
\
docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
docker-php-ext-configure gd --with-jpeg; \
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
docker-php-ext-install -j "$(nproc)" \

7
update.sh
View File

@ -73,6 +73,13 @@ for phpVersion in "${phpVersions[@]}"; do
-e '/libzip-dev/d' \
"$dir/Dockerfile"
fi
case "$phpVersion" in
7.2 | 7.3 )
sed -ri \
-e 's!gd --with-jpeg!gd --with-jpeg-dir=/usr --with-png-dir=/usr!g' \
"$dir/Dockerfile"
;;
esac
)