mirror of
https://github.com/joomla-docker/docker-joomla.git
synced 2024-06-03 14:50:47 +00:00
Fix gd extension in 7.4
This commit is contained in:
parent
93294783ad
commit
ff56867883
|
@ -24,7 +24,7 @@ RUN set -ex; \
|
||||||
postgresql-dev \
|
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-configure ldap; \
|
||||||
docker-php-ext-install -j "$(nproc)" \
|
docker-php-ext-install -j "$(nproc)" \
|
||||||
bz2 \
|
bz2 \
|
||||||
|
|
|
@ -20,7 +20,7 @@ RUN set -ex; \
|
||||||
libzip-dev \
|
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)"; \
|
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
|
||||||
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
|
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
|
||||||
docker-php-ext-install -j "$(nproc)" \
|
docker-php-ext-install -j "$(nproc)" \
|
||||||
|
|
|
@ -22,7 +22,7 @@ RUN set -ex; \
|
||||||
libpq-dev \
|
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)"; \
|
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
|
||||||
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
|
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
|
||||||
docker-php-ext-install -j "$(nproc)" \
|
docker-php-ext-install -j "$(nproc)" \
|
||||||
|
|
|
@ -23,7 +23,7 @@ RUN set -ex; \
|
||||||
postgresql-dev \
|
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-configure ldap; \
|
||||||
docker-php-ext-install -j "$(nproc)" \
|
docker-php-ext-install -j "$(nproc)" \
|
||||||
bz2 \
|
bz2 \
|
||||||
|
|
|
@ -19,7 +19,7 @@ RUN set -ex; \
|
||||||
libpq-dev \
|
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)"; \
|
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
|
||||||
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
|
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
|
||||||
docker-php-ext-install -j "$(nproc)" \
|
docker-php-ext-install -j "$(nproc)" \
|
||||||
|
|
|
@ -23,7 +23,7 @@ RUN set -ex; \
|
||||||
libzip-dev \
|
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)"; \
|
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
|
||||||
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
|
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
|
||||||
docker-php-ext-install -j "$(nproc)" \
|
docker-php-ext-install -j "$(nproc)" \
|
||||||
|
|
|
@ -24,7 +24,7 @@ RUN set -ex; \
|
||||||
postgresql-dev \
|
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-configure ldap; \
|
||||||
docker-php-ext-install -j "$(nproc)" \
|
docker-php-ext-install -j "$(nproc)" \
|
||||||
bz2 \
|
bz2 \
|
||||||
|
|
|
@ -20,7 +20,7 @@ RUN set -ex; \
|
||||||
libzip-dev \
|
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)"; \
|
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
|
||||||
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
|
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
|
||||||
docker-php-ext-install -j "$(nproc)" \
|
docker-php-ext-install -j "$(nproc)" \
|
||||||
|
|
|
@ -23,7 +23,7 @@ RUN set -ex; \
|
||||||
libzip-dev \
|
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)"; \
|
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
|
||||||
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
|
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
|
||||||
docker-php-ext-install -j "$(nproc)" \
|
docker-php-ext-install -j "$(nproc)" \
|
||||||
|
|
|
@ -24,7 +24,7 @@ RUN set -ex; \
|
||||||
postgresql-dev \
|
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-configure ldap; \
|
||||||
docker-php-ext-install -j "$(nproc)" \
|
docker-php-ext-install -j "$(nproc)" \
|
||||||
bz2 \
|
bz2 \
|
||||||
|
|
|
@ -20,7 +20,7 @@ RUN set -ex; \
|
||||||
libzip-dev \
|
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)"; \
|
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
|
||||||
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
|
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
|
||||||
docker-php-ext-install -j "$(nproc)" \
|
docker-php-ext-install -j "$(nproc)" \
|
||||||
|
|
|
@ -73,6 +73,13 @@ for phpVersion in "${phpVersions[@]}"; do
|
||||||
-e '/libzip-dev/d' \
|
-e '/libzip-dev/d' \
|
||||||
"$dir/Dockerfile"
|
"$dir/Dockerfile"
|
||||||
fi
|
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
|
||||||
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user