fix: strip second php-fpm config

shopware · May 16, 2023 · 6490521 · 6490521
1 parent 8cca72b
commit 6490521
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/8.0/Dockerfile b/8.0/Dockerfile
@@ -36,7 +36,8 @@ COPY --from=caddy --link /usr/bin/caddy /usr/bin/caddy
 
 RUN apk add --no-cache icu-data-full curl jq && \
     install-php-extensions bcmath gd intl mysqli pdo_mysql sockets bz2 gmp soap zip ffi redis opcache apcu amqp && \
-    mkdir -p /var/www/html
+    mkdir -p /var/www/html && \
+    rm /usr/local/etc/php-fpm.d/zz-docker.conf
 
 USER www-data
 

diff --git a/8.1/Dockerfile b/8.1/Dockerfile
@@ -36,7 +36,8 @@ COPY --from=caddy --link /usr/bin/caddy /usr/bin/caddy
 
 RUN apk add --no-cache icu-data-full curl jq && \
     install-php-extensions bcmath gd intl mysqli pdo_mysql sockets bz2 gmp soap zip ffi redis opcache apcu amqp && \
-    mkdir -p /var/www/html
+    mkdir -p /var/www/html && \
+    rm /usr/local/etc/php-fpm.d/zz-docker.conf
 
 USER www-data
 

diff --git a/8.2/Dockerfile b/8.2/Dockerfile
@@ -36,7 +36,8 @@ COPY --from=caddy --link /usr/bin/caddy /usr/bin/caddy
 
 RUN apk add --no-cache icu-data-full curl jq && \
     install-php-extensions bcmath gd intl mysqli pdo_mysql sockets bz2 gmp soap zip ffi redis opcache apcu amqp && \
-    mkdir -p /var/www/html
+    mkdir -p /var/www/html && \
+    rm /usr/local/etc/php-fpm.d/zz-docker.conf
 
 USER www-data
 

diff --git a/Dockerfile.template b/Dockerfile.template
@@ -36,7 +36,8 @@ COPY --from=caddy --link /usr/bin/caddy /usr/bin/caddy
 
 RUN apk add --no-cache icu-data-full curl jq && \
     install-php-extensions bcmath gd intl mysqli pdo_mysql sockets bz2 gmp soap zip ffi redis opcache apcu amqp && \
-    mkdir -p /var/www/html
+    mkdir -p /var/www/html && \
+    rm /usr/local/etc/php-fpm.d/zz-docker.conf
 
 USER www-data