joomla/docker
34
3
Fork 0
mirror of https://github.com/joomla-docker/docker-joomla.git synced 2024-11-18 02:55:13 +00:00
Code Issues Releases Activity

Merge pull request #86 from J0WI/php7.4-gd

Browse Source 
Fix gd extension in 7.4
This commit is contained in:
Michael Babker 2019-12-03 17:50:37 -06:00 committed by GitHub
commit 1a71435016
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 28 additions and 21 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)" \

4
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)" \
@ -38,7 +38,7 @@ RUN set -ex; \
\
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.18; \
pecl install memcached-3.1.4; \
pecl install memcached-3.1.5; \
pecl install redis-4.3.0; \
\
docker-php-ext-enable \

4
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 \
@ -38,7 +38,7 @@ RUN set -ex; \
\
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.18; \
pecl install memcached-3.1.4; \
pecl install memcached-3.1.5; \
pecl install redis-4.3.0; \
\
docker-php-ext-enable \

4
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)" \
@ -35,7 +35,7 @@ RUN set -ex; \
\
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.18; \
pecl install memcached-3.1.4; \
pecl install memcached-3.1.5; \
pecl install redis-4.3.0; \
\
docker-php-ext-enable \

4
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)" \
@ -39,7 +39,7 @@ RUN set -ex; \
\
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.18; \
pecl install memcached-3.1.4; \
pecl install memcached-3.1.5; \
pecl install redis-4.3.0; \
\
docker-php-ext-enable \

4
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 \
@ -39,7 +39,7 @@ RUN set -ex; \
\
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.18; \
pecl install memcached-3.1.4; \
pecl install memcached-3.1.5; \
pecl install redis-4.3.0; \
\
docker-php-ext-enable \

4
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)" \
@ -36,7 +36,7 @@ RUN set -ex; \
\
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.18; \
pecl install memcached-3.1.4; \
pecl install memcached-3.1.5; \
pecl install redis-4.3.0; \
\
docker-php-ext-enable \

4
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)" \
@ -39,7 +39,7 @@ RUN set -ex; \
\
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.18; \
pecl install memcached-3.1.4; \
pecl install memcached-3.1.5; \
pecl install redis-4.3.0; \
\
docker-php-ext-enable \

4
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 \
@ -39,7 +39,7 @@ RUN set -ex; \
\
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.18; \
pecl install memcached-3.1.4; \
pecl install memcached-3.1.5; \
pecl install redis-4.3.0; \
\
docker-php-ext-enable \

4
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)" \
@ -36,7 +36,7 @@ RUN set -ex; \
\
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.18; \
pecl install memcached-3.1.4; \
pecl install memcached-3.1.5; \
pecl install redis-4.3.0; \
\
docker-php-ext-enable \

9
update.sh
View File

@ -30,7 +30,7 @@ declare -A variantBases=(
)
declare -A pecl_versions=(
[php7-APCu]='5.1.18'
[php7-memcached]='3.1.4'
[php7-memcached]='3.1.5'
[php7-redis]='4.3.0'
)
@ -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
)