From 4389a3e217d3c19e34d078e4f0c1f9dd988907c9 Mon Sep 17 00:00:00 2001 From: J0WI Date: Mon, 10 Dec 2018 22:59:37 +0100 Subject: [PATCH] Remove mcrypt from PHP 7.3 image --- php7.3/apache/Dockerfile | 2 -- php7.3/fpm-alpine/Dockerfile | 2 -- php7.3/fpm/Dockerfile | 2 -- update.sh | 2 +- 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/php7.3/apache/Dockerfile b/php7.3/apache/Dockerfile index a1c8d65..89ac06e 100644 --- a/php7.3/apache/Dockerfile +++ b/php7.3/apache/Dockerfile @@ -17,7 +17,6 @@ RUN set -ex; \ libbz2-dev \ libjpeg-dev \ libldap2-dev \ - libmcrypt-dev \ libmemcached-dev \ libpng-dev \ libpq-dev \ @@ -30,7 +29,6 @@ RUN set -ex; \ bz2 \ gd \ ldap \ - mcrypt \ mysqli \ pdo_mysql \ pdo_pgsql \ diff --git a/php7.3/fpm-alpine/Dockerfile b/php7.3/fpm-alpine/Dockerfile index 7c0ae75..7454b84 100644 --- a/php7.3/fpm-alpine/Dockerfile +++ b/php7.3/fpm-alpine/Dockerfile @@ -16,7 +16,6 @@ RUN set -ex; \ autoconf \ bzip2-dev \ libjpeg-turbo-dev \ - libmcrypt-dev \ libmemcached-dev \ libpng-dev \ openldap-dev \ @@ -30,7 +29,6 @@ RUN set -ex; \ bz2 \ gd \ ldap \ - mcrypt \ mysqli \ pdo_mysql \ pdo_pgsql \ diff --git a/php7.3/fpm/Dockerfile b/php7.3/fpm/Dockerfile index 99ba25e..c05922e 100644 --- a/php7.3/fpm/Dockerfile +++ b/php7.3/fpm/Dockerfile @@ -14,7 +14,6 @@ RUN set -ex; \ libbz2-dev \ libjpeg-dev \ libldap2-dev \ - libmcrypt-dev \ libmemcached-dev \ libpng-dev \ libpq-dev \ @@ -27,7 +26,6 @@ RUN set -ex; \ bz2 \ gd \ ldap \ - mcrypt \ mysqli \ pdo_mysql \ pdo_pgsql \ diff --git a/update.sh b/update.sh index 5bfffaa..eecaa9a 100755 --- a/update.sh +++ b/update.sh @@ -71,7 +71,7 @@ for phpVersion in "${phpVersions[@]}"; do cp -a "$entrypoint" "$dir/docker-entrypoint.sh" cp -a "makedb.php" "$dir/makedb.php" - if [ $phpVersionDir = "php7.2" ]; then + if [ $phpVersionDir = "php7.2" -o $phpVersionDir = "php7.3" ]; then sed \ -e '/libmcrypt-dev/d' \ -e '/mcrypt/d' \