octoleo/docker-joomla
2
3
Fork 0
mirror of https://github.com/octoleo/docker-joomla.git synced 2024-05-31 21:40:47 +00:00
Code Issues Releases Activity

Remove mcrypt from PHP 7.3 image

Browse Source
This commit is contained in:
J0WI 2018-12-10 22:59:37 +01:00
parent d047722949
commit 4389a3e217
4 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
php7.3/apache/Dockerfile
View File

@ -17,7 +17,6 @@ RUN set -ex; \
libbz2-dev \ libbz2-dev \
libjpeg-dev \ libjpeg-dev \
libldap2-dev \ libldap2-dev \
libmcrypt-dev \
libmemcached-dev \ libmemcached-dev \
libpng-dev \ libpng-dev \
libpq-dev \ libpq-dev \
@ -30,7 +29,6 @@ RUN set -ex; \
bz2 \ bz2 \
gd \ gd \
ldap \ ldap \
mcrypt \
mysqli \ mysqli \
pdo_mysql \ pdo_mysql \
pdo_pgsql \ pdo_pgsql \

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

@ -16,7 +16,6 @@ RUN set -ex; \
autoconf \ autoconf \
bzip2-dev \ bzip2-dev \
libjpeg-turbo-dev \ libjpeg-turbo-dev \
libmcrypt-dev \
libmemcached-dev \ libmemcached-dev \
libpng-dev \ libpng-dev \
openldap-dev \ openldap-dev \
@ -30,7 +29,6 @@ RUN set -ex; \
bz2 \ bz2 \
gd \ gd \
ldap \ ldap \
mcrypt \
mysqli \ mysqli \
pdo_mysql \ pdo_mysql \
pdo_pgsql \ pdo_pgsql \

2
php7.3/fpm/Dockerfile
View File

@ -14,7 +14,6 @@ RUN set -ex; \
libbz2-dev \ libbz2-dev \
libjpeg-dev \ libjpeg-dev \
libldap2-dev \ libldap2-dev \
libmcrypt-dev \
libmemcached-dev \ libmemcached-dev \
libpng-dev \ libpng-dev \
libpq-dev \ libpq-dev \
@ -27,7 +26,6 @@ RUN set -ex; \
bz2 \ bz2 \
gd \ gd \
ldap \ ldap \
mcrypt \
mysqli \ mysqli \
pdo_mysql \ pdo_mysql \
pdo_pgsql \ pdo_pgsql \

2
update.sh
View File

@ -71,7 +71,7 @@ for phpVersion in "${phpVersions[@]}"; do
cp -a "$entrypoint" "$dir/docker-entrypoint.sh" cp -a "$entrypoint" "$dir/docker-entrypoint.sh"
cp -a "makedb.php" "$dir/makedb.php" cp -a "makedb.php" "$dir/makedb.php"
if [ $phpVersionDir = "php7.2" ]; then if [ $phpVersionDir = "php7.2" -o $phpVersionDir = "php7.3" ]; then
sed \ sed \
-e '/libmcrypt-dev/d' \ -e '/libmcrypt-dev/d' \
-e '/mcrypt/d' \ -e '/mcrypt/d' \