Removes libmcrypt-dev from all images.

2022-02-15 16:06:45 +02:00 · 2022-02-15 16:06:45 +02:00 · 94faec5bbf
parent 15b8346ec6
commit 94faec5bbf
10 changed files with 4 additions and 9 deletions
--- 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 \
--- 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 \
--- 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 \
--- 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 \
--- 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 \
--- 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 \
--- 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 \
--- 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 \
--- 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 \
--- 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 \