last 8.0 fix

dist/7.1/cli/Dockerfile

@@ -66,11 +66,7 @@ RUN set -xe \
         bcmath \
             redis \
                 mcrypt \
-    
-
- && pecl install mongodb \
- && docker-php-ext-enable mongodb \
- && apk del .build-deps \
+     && apk del .build-deps \
  && rm -rf /tmp/* /var/cache/apk/* 
 
  RUN echo "memory_limit = -1" > /usr/local/etc/php/conf.d/custom.ini \

dist/7.1/fpm/Dockerfile

@@ -66,11 +66,7 @@ RUN set -xe \
         bcmath \
             redis \
                 mcrypt \
-    
-
- && pecl install mongodb \
- && docker-php-ext-enable mongodb \
- && apk del .build-deps \
+     && apk del .build-deps \
  && rm -rf /tmp/* /var/cache/apk/* 
 
     RUN echo "memory_limit = 128M" > /usr/local/etc/php/conf.d/custom.ini \

dist/7.2/cli/Dockerfile

@@ -63,11 +63,7 @@ RUN set -xe \
         soap \
         bcmath \
             redis \
-        
- && docker-php-ext-install sodium \
-
- && pecl install mongodb \
- && docker-php-ext-enable mongodb \
+         && docker-php-ext-install sodium \
  && apk del .build-deps \
  && rm -rf /tmp/* /var/cache/apk/* 
 

dist/7.2/fpm/Dockerfile

@@ -63,11 +63,7 @@ RUN set -xe \
         soap \
         bcmath \
             redis \
-        
- && docker-php-ext-install sodium \
-
- && pecl install mongodb \
- && docker-php-ext-enable mongodb \
+         && docker-php-ext-install sodium \
  && apk del .build-deps \
  && rm -rf /tmp/* /var/cache/apk/* 
 

dist/7.3/cli/Dockerfile

@@ -64,11 +64,7 @@ RUN set -xe \
         soap \
         bcmath \
             redis \
-        
- && docker-php-ext-install sodium \
-
- && pecl install mongodb \
- && docker-php-ext-enable mongodb \
+         && docker-php-ext-install sodium \
  && apk del .build-deps \
  && rm -rf /tmp/* /var/cache/apk/* 
 

dist/7.3/fpm/Dockerfile

@@ -64,11 +64,7 @@ RUN set -xe \
         soap \
         bcmath \
             redis \
-        
- && docker-php-ext-install sodium \
-
- && pecl install mongodb \
- && docker-php-ext-enable mongodb \
+         && docker-php-ext-install sodium \
  && apk del .build-deps \
  && rm -rf /tmp/* /var/cache/apk/* 
 

dist/7.4/cli/Dockerfile

@@ -32,8 +32,6 @@ RUN set -xe \
         postgresql-client \
         postgresql-dev \
         openssh-client \
-            libmcrypt-dev \
-        libmcrypt \
                 libzip-dev \
                 libgcrypt-dev \
         oniguruma-dev \
@@ -65,9 +63,7 @@ RUN set -xe \
         soap \
         bcmath \
             redis \
-        
- && docker-php-ext-install sodium \
-
+         && docker-php-ext-install sodium \
  && apk del .build-deps \
  && rm -rf /tmp/* /var/cache/apk/* 
 

dist/7.4/fpm/Dockerfile

@@ -32,8 +32,6 @@ RUN set -xe \
         postgresql-client \
         postgresql-dev \
         openssh-client \
-            libmcrypt-dev \
-        libmcrypt \
                 libzip-dev \
                 libgcrypt-dev \
         oniguruma-dev \
@@ -65,9 +63,7 @@ RUN set -xe \
         soap \
         bcmath \
             redis \
-        
- && docker-php-ext-install sodium \
-
+         && docker-php-ext-install sodium \
  && apk del .build-deps \
  && rm -rf /tmp/* /var/cache/apk/* 
 

dist/8.0/cli/Dockerfile

@@ -32,8 +32,6 @@ RUN set -xe \
         postgresql-client \
         postgresql-dev \
         openssh-client \
-            libmcrypt-dev \
-        libmcrypt \
              && apk --update --no-cache add grep \
     && docker-php-ext-configure gd \
       --with-freetype=/usr/include/ \
@@ -58,11 +56,7 @@ RUN set -xe \
         simplexml \
         soap \
         bcmath \
-                mcrypt \
-    
-
- && pecl install mongodb \
- && docker-php-ext-enable mongodb \
+         && docker-php-ext-install sodium \
  && apk del .build-deps \
  && rm -rf /tmp/* /var/cache/apk/* 
 

dist/8.0/fpm/Dockerfile

@@ -32,8 +32,6 @@ RUN set -xe \
         postgresql-client \
         postgresql-dev \
         openssh-client \
-            libmcrypt-dev \
-        libmcrypt \
              && apk --update --no-cache add grep \
     && docker-php-ext-configure gd \
       --with-freetype=/usr/include/ \
@@ -58,11 +56,7 @@ RUN set -xe \
         simplexml \
         soap \
         bcmath \
-                mcrypt \
-    
-
- && pecl install mongodb \
- && docker-php-ext-enable mongodb \
+         && docker-php-ext-install sodium \
  && apk del .build-deps \
  && rm -rf /tmp/* /var/cache/apk/* 
 

templates/Dockerfile-cli.twig

@@ -32,7 +32,7 @@ RUN set -xe \
         postgresql-client \
         postgresql-dev \
         openssh-client \
-    {% if not isPHP72 and not isPHP73 %}
+    {% if not isPHP72 and not isPHP73 and not isPHP74 and not isPHP80 %}
         libmcrypt-dev \
         libmcrypt \
     {% endif %}
@@ -87,18 +87,12 @@ RUN set -xe \
     {% if not isPHP80 %}
         redis \
     {% endif %}
-    {% if not isPHP72 and not isPHP73 and not isPHP74 %}
+    {% if not isPHP72 and not isPHP73 and not isPHP74 and not isPHP80 %}
         mcrypt \
     {% endif %}
-
-{% if isPHP72 or isPHP73 or isPHP74 %}
+{% if isPHP72 or isPHP73 or isPHP74 or isPHP80 %}
  && docker-php-ext-install sodium \
 {% endif %}
-
-{% if not isPHP74 %}{# no pecl - and we dont need mongodb #}
- && pecl install mongodb \
- && docker-php-ext-enable mongodb \
-{% endif %}
  && apk del .build-deps \
  && rm -rf /tmp/* /var/cache/apk/*