Merge pull request #1235 from uselagoon/phpfpm_musl

uselagoon · Feb 14, 2025 · 8515e12 · 8515e12
2 parents 1bba5c7 + 8d361d1
commit 8515e12
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 4 deletions.
diff --git a/images/php-cli/8.1.Dockerfile b/images/php-cli/8.1.Dockerfile
@@ -16,7 +16,6 @@ ENV LAGOON=cli
 STOPSIGNAL SIGTERM
 
 RUN apk add -U --repository http://dl-cdn.alpinelinux.org/alpine/v3.19/main mariadb-client=10.11.6-r0 mariadb-connector-c \
-    && apk upgrade --available musl \
     && apk add --no-cache bash \
         coreutils \
         findutils \

diff --git a/images/php-cli/8.2.Dockerfile b/images/php-cli/8.2.Dockerfile
@@ -16,7 +16,6 @@ ENV LAGOON=cli
 STOPSIGNAL SIGTERM
 
 RUN apk add -U --repository http://dl-cdn.alpinelinux.org/alpine/v3.19/main mariadb-client=10.11.6-r0 mariadb-connector-c \
-    && apk upgrade --available musl \
     && apk add --no-cache bash \
         coreutils \
         findutils \

diff --git a/images/php-cli/8.3.Dockerfile b/images/php-cli/8.3.Dockerfile
@@ -16,7 +16,6 @@ ENV LAGOON=cli
 STOPSIGNAL SIGTERM
 
 RUN apk add -U --repository http://dl-cdn.alpinelinux.org/alpine/v3.19/main mariadb-client=10.11.6-r0 mariadb-connector-c \
-    && apk upgrade --available musl \
     && apk add --no-cache bash \
         coreutils \
         findutils \

diff --git a/images/php-cli/8.4.Dockerfile b/images/php-cli/8.4.Dockerfile
@@ -16,7 +16,6 @@ ENV LAGOON=cli
 STOPSIGNAL SIGTERM
 
 RUN apk add -U --repository http://dl-cdn.alpinelinux.org/alpine/v3.19/main mariadb-client=10.11.6-r0 mariadb-connector-c \
-    && apk upgrade --available musl \
     && apk add --no-cache bash \
         coreutils \
         findutils \

diff --git a/images/php-fpm/8.1.Dockerfile b/images/php-fpm/8.1.Dockerfile
@@ -50,6 +50,7 @@ COPY blackfire.ini /usr/local/etc/php/conf.d/blackfire.disable
 COPY --from=docker.io/mlocati/php-extension-installer:2.7 /usr/bin/install-php-extensions /usr/local/bin/
 
 RUN apk update \
+    && apk upgrade --available musl \
     && apk add --no-cache --virtual .devdeps \
         # for gd
         freetype-dev \

diff --git a/images/php-fpm/8.2.Dockerfile b/images/php-fpm/8.2.Dockerfile
@@ -50,6 +50,7 @@ COPY blackfire.ini /usr/local/etc/php/conf.d/blackfire.disable
 COPY --from=docker.io/mlocati/php-extension-installer:2.7 /usr/bin/install-php-extensions /usr/local/bin/
 
 RUN apk update \
+    && apk upgrade --available musl \
     && apk add --no-cache --virtual .devdeps \
         # for gd
         freetype-dev \

diff --git a/images/php-fpm/8.3.Dockerfile b/images/php-fpm/8.3.Dockerfile
@@ -50,6 +50,7 @@ COPY blackfire.ini /usr/local/etc/php/conf.d/blackfire.disable
 COPY --from=docker.io/mlocati/php-extension-installer:2.7 /usr/bin/install-php-extensions /usr/local/bin/
 
 RUN apk update \
+    && apk upgrade --available musl \
     && apk add --no-cache --virtual .devdeps \
         # for gd
         freetype-dev \

diff --git a/images/php-fpm/8.4.Dockerfile b/images/php-fpm/8.4.Dockerfile
@@ -50,6 +50,7 @@ COPY blackfire.ini /usr/local/etc/php/conf.d/blackfire.disable
 COPY --from=docker.io/mlocati/php-extension-installer:2.7 /usr/bin/install-php-extensions /usr/local/bin/
 
 RUN apk update \
+    && apk upgrade --available musl \
     && apk add --no-cache --virtual .devdeps \
         # for gd
         freetype-dev \