Removed more image magick and add xmlrpc via pecl in php 8.0

This commit is contained in:
Llewellyn van der Merwe 2022-09-11 12:49:17 +02:00
parent 8a36b45a19
commit 66cee22289
Signed by: Llewellyn
GPG Key ID: A9201372263741E7
6 changed files with 18 additions and 13 deletions

View File

@ -35,7 +35,6 @@ RUN set -ex; \
libjpeg-dev \ libjpeg-dev \
libldap2-dev \ libldap2-dev \
libmemcached-dev \ libmemcached-dev \
libmagickwand-dev \
wkhtmltopdf \ wkhtmltopdf \
libpq-dev \ libpq-dev \
libpng-dev \ libpng-dev \

View File

@ -35,7 +35,6 @@ RUN set -ex; \
libjpeg-dev \ libjpeg-dev \
libldap2-dev \ libldap2-dev \
libmemcached-dev \ libmemcached-dev \
libmagickwand-dev \
wkhtmltopdf \ wkhtmltopdf \
libpq-dev \ libpq-dev \
libpng-dev \ libpng-dev \

View File

@ -35,7 +35,6 @@ RUN set -ex; \
libjpeg-dev \ libjpeg-dev \
libldap2-dev \ libldap2-dev \
libmemcached-dev \ libmemcached-dev \
libmagickwand-dev \
wkhtmltopdf \ wkhtmltopdf \
libpq-dev \ libpq-dev \
libpng-dev \ libpng-dev \
@ -59,7 +58,6 @@ RUN set -ex; \
gd \ gd \
mbstring \ mbstring \
xml \ xml \
xmlrpc \
gmp \ gmp \
intl \ intl \
ldap \ ldap \
@ -83,10 +81,12 @@ RUN set -ex; \
# pecl will claim success even if one install fails, so we need to perform each install separately # pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.21; \ pecl install APCu-5.1.21; \
pecl install memcached-3.2.0; \ pecl install memcached-3.2.0; \
pecl install xmlrpc-1.0.0; \
\ \
docker-php-ext-enable \ docker-php-ext-enable \
apcu \ apcu \
memcached \ memcached \
xmlrpc \
; \ ; \
rm -r /tmp/pear; \ rm -r /tmp/pear; \
\ \

View File

@ -35,7 +35,6 @@ RUN set -ex; \
libjpeg-dev \ libjpeg-dev \
libldap2-dev \ libldap2-dev \
libmemcached-dev \ libmemcached-dev \
libmagickwand-dev \
wkhtmltopdf \ wkhtmltopdf \
libpq-dev \ libpq-dev \
libpng-dev \ libpng-dev \
@ -59,7 +58,6 @@ RUN set -ex; \
gd \ gd \
mbstring \ mbstring \
xml \ xml \
xmlrpc \
gmp \ gmp \
intl \ intl \
ldap \ ldap \
@ -83,10 +81,12 @@ RUN set -ex; \
# pecl will claim success even if one install fails, so we need to perform each install separately # pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.21; \ pecl install APCu-5.1.21; \
pecl install memcached-3.2.0; \ pecl install memcached-3.2.0; \
pecl install xmlrpc-1.0.0; \
\ \
docker-php-ext-enable \ docker-php-ext-enable \
apcu \ apcu \
memcached \ memcached \
xmlrpc \
; \ ; \
rm -r /tmp/pear; \ rm -r /tmp/pear; \
\ \

View File

@ -67,7 +67,6 @@ RUN set -ex; \
libjpeg-dev \ libjpeg-dev \
libldap2-dev \ libldap2-dev \
libmemcached-dev \ libmemcached-dev \
libmagickwand-dev \
wkhtmltopdf \ wkhtmltopdf \
libpq-dev \ libpq-dev \
libpng-dev \ libpng-dev \
@ -96,7 +95,9 @@ RUN set -ex; \
gd \ gd \
mbstring \ mbstring \
xml \ xml \
{{ if env.phpVersion == "7.4" then ( -}}
xmlrpc \ xmlrpc \
{{ ) else "" end -}}
gmp \ gmp \
intl \ intl \
ldap \ ldap \
@ -122,10 +123,16 @@ RUN set -ex; \
# pecl will claim success even if one install fails, so we need to perform each install separately # pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-{{ env.pecl_APCu }}; \ pecl install APCu-{{ env.pecl_APCu }}; \
pecl install memcached-{{ env.pecl_memcached }}; \ pecl install memcached-{{ env.pecl_memcached }}; \
{{ if env.phpVersion == "8.0" then ( -}}
pecl install xmlrpc-1.0.0; \
{{ ) else "" end -}}
\ \
docker-php-ext-enable \ docker-php-ext-enable \
apcu \ apcu \
memcached \ memcached \
{{ if env.phpVersion == "8.0" then ( -}}
xmlrpc \
{{ ) else "" end -}}
; \ ; \
rm -r /tmp/pear; \ rm -r /tmp/pear; \
\ \
@ -141,10 +148,16 @@ RUN set -ex; \
# pecl will claim success even if one install fails, so we need to perform each install separately # pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-{{ env.pecl_APCu }}; \ pecl install APCu-{{ env.pecl_APCu }}; \
pecl install memcached-{{ env.pecl_memcached }}; \ pecl install memcached-{{ env.pecl_memcached }}; \
{{ if env.phpVersion == "8.0" then ( -}}
pecl install xmlrpc-1.0.0; \
{{ ) else "" end -}}
\ \
docker-php-ext-enable \ docker-php-ext-enable \
apcu \ apcu \
memcached \ memcached \
{{ if env.phpVersion == "8.0" then ( -}}
xmlrpc \
{{ ) else "" end -}}
; \ ; \
rm -r /tmp/pear; \ rm -r /tmp/pear; \
\ \

View File

@ -64,12 +64,6 @@ for version; do
# get the memcached values # get the memcached values
pecl_memcached="$(echo "${peclValues}" | jq -r '.memcached')" pecl_memcached="$(echo "${peclValues}" | jq -r '.memcached')"
export pecl_memcached export pecl_memcached
# get the redis values
pecl_redis="$(echo "${peclValues}" | jq -r '.redis')"
export pecl_redis
# get the mcrypt values
pecl_mcrypt="$(echo "${peclValues}" | jq -r '.mcrypt')"
export pecl_mcrypt
for variant in "${variants[@]}"; do for variant in "${variants[@]}"; do
export variant export variant