diff --git a/4.1/php7.4/apache/Dockerfile b/4.1/php7.4/apache/Dockerfile index e5f649f..b5ac593 100644 --- a/4.1/php7.4/apache/Dockerfile +++ b/4.1/php7.4/apache/Dockerfile @@ -24,7 +24,6 @@ RUN set -ex; \ libicu-dev \ libjpeg-dev \ libldap2-dev \ - libmcrypt-dev \ libmemcached-dev \ libpng-dev \ libpq-dev \ diff --git a/4.1/php7.4/fpm-alpine/Dockerfile b/4.1/php7.4/fpm-alpine/Dockerfile index 00ae71b..0a2c801 100644 --- a/4.1/php7.4/fpm-alpine/Dockerfile +++ b/4.1/php7.4/fpm-alpine/Dockerfile @@ -23,7 +23,6 @@ RUN set -ex; \ gmp-dev \ icu-dev \ libjpeg-turbo-dev \ - libmcrypt-dev \ libmemcached-dev \ libpng-dev \ libzip-dev \ diff --git a/4.1/php7.4/fpm/Dockerfile b/4.1/php7.4/fpm/Dockerfile index e027fab..6f56598 100644 --- a/4.1/php7.4/fpm/Dockerfile +++ b/4.1/php7.4/fpm/Dockerfile @@ -22,7 +22,6 @@ RUN set -ex; \ libicu-dev \ libjpeg-dev \ libldap2-dev \ - libmcrypt-dev \ libmemcached-dev \ libpng-dev \ libpq-dev \ diff --git a/4.1/php8.0/apache/Dockerfile b/4.1/php8.0/apache/Dockerfile index 9029090..2afe55e 100644 --- a/4.1/php8.0/apache/Dockerfile +++ b/4.1/php8.0/apache/Dockerfile @@ -24,7 +24,6 @@ RUN set -ex; \ libicu-dev \ libjpeg-dev \ libldap2-dev \ - libmcrypt-dev \ libmemcached-dev \ libpng-dev \ libpq-dev \ diff --git a/4.1/php8.0/fpm-alpine/Dockerfile b/4.1/php8.0/fpm-alpine/Dockerfile index e1100e8..4667e25 100644 --- a/4.1/php8.0/fpm-alpine/Dockerfile +++ b/4.1/php8.0/fpm-alpine/Dockerfile @@ -23,7 +23,6 @@ RUN set -ex; \ gmp-dev \ icu-dev \ libjpeg-turbo-dev \ - libmcrypt-dev \ libmemcached-dev \ libpng-dev \ libzip-dev \ diff --git a/4.1/php8.0/fpm/Dockerfile b/4.1/php8.0/fpm/Dockerfile index db04747..bb064cc 100644 --- a/4.1/php8.0/fpm/Dockerfile +++ b/4.1/php8.0/fpm/Dockerfile @@ -22,7 +22,6 @@ RUN set -ex; \ libicu-dev \ libjpeg-dev \ libldap2-dev \ - libmcrypt-dev \ libmemcached-dev \ libpng-dev \ libpq-dev \ diff --git a/4.1/php8.1/apache/Dockerfile b/4.1/php8.1/apache/Dockerfile index 9f9508b..f19c510 100644 --- a/4.1/php8.1/apache/Dockerfile +++ b/4.1/php8.1/apache/Dockerfile @@ -24,7 +24,6 @@ RUN set -ex; \ libicu-dev \ libjpeg-dev \ libldap2-dev \ - libmcrypt-dev \ libmemcached-dev \ libpng-dev \ libpq-dev \ diff --git a/4.1/php8.1/fpm-alpine/Dockerfile b/4.1/php8.1/fpm-alpine/Dockerfile index 8d6f44f..a560da6 100644 --- a/4.1/php8.1/fpm-alpine/Dockerfile +++ b/4.1/php8.1/fpm-alpine/Dockerfile @@ -23,7 +23,6 @@ RUN set -ex; \ gmp-dev \ icu-dev \ libjpeg-turbo-dev \ - libmcrypt-dev \ libmemcached-dev \ libpng-dev \ libzip-dev \ diff --git a/4.1/php8.1/fpm/Dockerfile b/4.1/php8.1/fpm/Dockerfile index c3183c4..559d592 100644 --- a/4.1/php8.1/fpm/Dockerfile +++ b/4.1/php8.1/fpm/Dockerfile @@ -22,7 +22,6 @@ RUN set -ex; \ libicu-dev \ libjpeg-dev \ libldap2-dev \ - libmcrypt-dev \ libmemcached-dev \ libpng-dev \ libpq-dev \ diff --git a/Dockerfile.template b/Dockerfile.template index ae42cc9..13ccac8 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -30,7 +30,9 @@ RUN set -ex; \ icu-dev \ {{ ) else "" end -}} libjpeg-turbo-dev \ +{{ if env.version == "3.10" then ( -}} libmcrypt-dev \ +{{ ) else "" end -}} libmemcached-dev \ libpng-dev \ libzip-dev \ @@ -99,7 +101,9 @@ RUN set -ex; \ {{ ) else "" end -}} libjpeg-dev \ libldap2-dev \ +{{ if env.version == "3.10" then ( -}} libmcrypt-dev \ +{{ ) else "" end -}} libmemcached-dev \ libpng-dev \ libpq-dev \