upgrade PHP and Composer in latest images

swoole · Oct 29, 2024 · 4ad9889 · 4ad9889
1 parent 605dc7d
commit 4ad9889
Show file tree

Hide file tree

Showing 25 changed files with 37 additions and 37 deletions.
diff --git a/config/5.1.5.yml b/config/5.1.5.yml
@@ -5,11 +5,11 @@ status: "under development"
 php:
   - "8.0.30"
   - "8.1.30"
-  - "8.2.24"
-  - "8.3.12"
+  - "8.2.25"
+  - "8.3.13"
 image:
   composer:
-    version: "2.8.1"
+    version: "2.8.2"
   php_extensions:
     redis:
       version: "6.1.0"

diff --git a/config/6.0.0-beta.yml b/config/6.0.0-beta.yml
@@ -5,11 +5,11 @@ status: "under development"
 php:
   - "8.0.30"
   - "8.1.30"
-  - "8.2.24"
-  - "8.3.12"
+  - "8.2.25"
+  - "8.3.13"
 image:
   composer:
-    version: "2.8.1"
+    version: "2.8.2"
   php_extensions:
     redis:
       version: "6.1.0"

diff --git a/config/nightly.yml b/config/nightly.yml
@@ -8,7 +8,7 @@ php:
   - "8.3"
 image:
   composer:
-    version: "2.8.1"
+    version: "2.8.2"
   inotify: true
   php_extensions:
     redis:

diff --git a/dockerfiles/5.1.5/php8.0/alpine/Dockerfile b/dockerfiles/5.1.5/php8.0/alpine/Dockerfile
@@ -1,6 +1,6 @@
 FROM php:8.0.30-cli-alpine3.16
 
-COPY --from=composer:2.8.1 /usr/bin/composer /usr/bin/
+COPY --from=composer:2.8.2 /usr/bin/composer /usr/bin/
 
 RUN \
     set -ex && \

diff --git a/dockerfiles/5.1.5/php8.0/cli/Dockerfile b/dockerfiles/5.1.5/php8.0/cli/Dockerfile
@@ -6,7 +6,7 @@ ENV TERM=xterm-color
 ARG DEV_MODE
 ENV DEV_MODE=$DEV_MODE
 
-COPY --from=composer:2.8.1 /usr/bin/composer /usr/bin/
+COPY --from=composer:2.8.2 /usr/bin/composer /usr/bin/
 COPY ./rootfilesystem/ /
 
 RUN \

diff --git a/dockerfiles/5.1.5/php8.1/alpine/Dockerfile b/dockerfiles/5.1.5/php8.1/alpine/Dockerfile
@@ -1,6 +1,6 @@
 FROM php:8.1.30-cli-alpine3.20
 
-COPY --from=composer:2.8.1 /usr/bin/composer /usr/bin/
+COPY --from=composer:2.8.2 /usr/bin/composer /usr/bin/
 
 RUN \
     set -ex && \

diff --git a/dockerfiles/5.1.5/php8.1/cli/Dockerfile b/dockerfiles/5.1.5/php8.1/cli/Dockerfile
@@ -6,7 +6,7 @@ ENV TERM=xterm-color
 ARG DEV_MODE
 ENV DEV_MODE=$DEV_MODE
 
-COPY --from=composer:2.8.1 /usr/bin/composer /usr/bin/
+COPY --from=composer:2.8.2 /usr/bin/composer /usr/bin/
 COPY ./rootfilesystem/ /
 
 RUN \

diff --git a/dockerfiles/5.1.5/php8.2/alpine/Dockerfile b/dockerfiles/5.1.5/php8.2/alpine/Dockerfile
@@ -1,6 +1,6 @@
-FROM php:8.2.24-cli-alpine3.20
+FROM php:8.2.25-cli-alpine3.20
 
-COPY --from=composer:2.8.1 /usr/bin/composer /usr/bin/
+COPY --from=composer:2.8.2 /usr/bin/composer /usr/bin/
 
 RUN \
     set -ex && \

diff --git a/dockerfiles/5.1.5/php8.2/cli/Dockerfile b/dockerfiles/5.1.5/php8.2/cli/Dockerfile
@@ -1,12 +1,12 @@
-FROM php:8.2.24-cli
+FROM php:8.2.25-cli
 
 ENV DEBIAN_FRONTEND=noninteractive
 ENV TERM=xterm-color
 
 ARG DEV_MODE
 ENV DEV_MODE=$DEV_MODE
 
-COPY --from=composer:2.8.1 /usr/bin/composer /usr/bin/
+COPY --from=composer:2.8.2 /usr/bin/composer /usr/bin/
 COPY ./rootfilesystem/ /
 
 RUN \

diff --git a/dockerfiles/5.1.5/php8.3/alpine/Dockerfile b/dockerfiles/5.1.5/php8.3/alpine/Dockerfile
@@ -1,6 +1,6 @@
-FROM php:8.3.12-cli-alpine3.20
+FROM php:8.3.13-cli-alpine3.20
 
-COPY --from=composer:2.8.1 /usr/bin/composer /usr/bin/
+COPY --from=composer:2.8.2 /usr/bin/composer /usr/bin/
 
 RUN \
     set -ex && \

diff --git a/dockerfiles/5.1.5/php8.3/cli/Dockerfile b/dockerfiles/5.1.5/php8.3/cli/Dockerfile
@@ -1,12 +1,12 @@
-FROM php:8.3.12-cli
+FROM php:8.3.13-cli
 
 ENV DEBIAN_FRONTEND=noninteractive
 ENV TERM=xterm-color
 
 ARG DEV_MODE
 ENV DEV_MODE=$DEV_MODE
 
-COPY --from=composer:2.8.1 /usr/bin/composer /usr/bin/
+COPY --from=composer:2.8.2 /usr/bin/composer /usr/bin/
 COPY ./rootfilesystem/ /
 
 RUN \

diff --git a/dockerfiles/6.0.0-beta/php8.0/alpine/Dockerfile b/dockerfiles/6.0.0-beta/php8.0/alpine/Dockerfile
@@ -1,6 +1,6 @@
 FROM php:8.0.30-cli-alpine3.16
 
-COPY --from=composer:2.8.1 /usr/bin/composer /usr/bin/
+COPY --from=composer:2.8.2 /usr/bin/composer /usr/bin/
 
 RUN \
     set -ex && \

diff --git a/dockerfiles/6.0.0-beta/php8.0/cli/Dockerfile b/dockerfiles/6.0.0-beta/php8.0/cli/Dockerfile
@@ -6,7 +6,7 @@ ENV TERM=xterm-color
 ARG DEV_MODE
 ENV DEV_MODE=$DEV_MODE
 
-COPY --from=composer:2.8.1 /usr/bin/composer /usr/bin/
+COPY --from=composer:2.8.2 /usr/bin/composer /usr/bin/
 COPY ./rootfilesystem/ /
 
 RUN \

diff --git a/dockerfiles/6.0.0-beta/php8.1/alpine/Dockerfile b/dockerfiles/6.0.0-beta/php8.1/alpine/Dockerfile
@@ -1,6 +1,6 @@
 FROM php:8.1.30-cli-alpine3.20
 
-COPY --from=composer:2.8.1 /usr/bin/composer /usr/bin/
+COPY --from=composer:2.8.2 /usr/bin/composer /usr/bin/
 
 RUN \
     set -ex && \

diff --git a/dockerfiles/6.0.0-beta/php8.1/cli/Dockerfile b/dockerfiles/6.0.0-beta/php8.1/cli/Dockerfile
@@ -6,7 +6,7 @@ ENV TERM=xterm-color
 ARG DEV_MODE
 ENV DEV_MODE=$DEV_MODE
 
-COPY --from=composer:2.8.1 /usr/bin/composer /usr/bin/
+COPY --from=composer:2.8.2 /usr/bin/composer /usr/bin/
 COPY ./rootfilesystem/ /
 
 RUN \

diff --git a/dockerfiles/6.0.0-beta/php8.2/alpine/Dockerfile b/dockerfiles/6.0.0-beta/php8.2/alpine/Dockerfile
@@ -1,6 +1,6 @@
-FROM php:8.2.24-cli-alpine3.20
+FROM php:8.2.25-cli-alpine3.20
 
-COPY --from=composer:2.8.1 /usr/bin/composer /usr/bin/
+COPY --from=composer:2.8.2 /usr/bin/composer /usr/bin/
 
 RUN \
     set -ex && \

diff --git a/dockerfiles/6.0.0-beta/php8.2/cli/Dockerfile b/dockerfiles/6.0.0-beta/php8.2/cli/Dockerfile
@@ -1,12 +1,12 @@
-FROM php:8.2.24-cli
+FROM php:8.2.25-cli
 
 ENV DEBIAN_FRONTEND=noninteractive
 ENV TERM=xterm-color
 
 ARG DEV_MODE
 ENV DEV_MODE=$DEV_MODE
 
-COPY --from=composer:2.8.1 /usr/bin/composer /usr/bin/
+COPY --from=composer:2.8.2 /usr/bin/composer /usr/bin/
 COPY ./rootfilesystem/ /
 
 RUN \

diff --git a/dockerfiles/6.0.0-beta/php8.3/alpine/Dockerfile b/dockerfiles/6.0.0-beta/php8.3/alpine/Dockerfile
@@ -1,6 +1,6 @@
-FROM php:8.3.12-cli-alpine3.20
+FROM php:8.3.13-cli-alpine3.20
 
-COPY --from=composer:2.8.1 /usr/bin/composer /usr/bin/
+COPY --from=composer:2.8.2 /usr/bin/composer /usr/bin/
 
 RUN \
     set -ex && \

diff --git a/dockerfiles/6.0.0-beta/php8.3/cli/Dockerfile b/dockerfiles/6.0.0-beta/php8.3/cli/Dockerfile
@@ -1,12 +1,12 @@
-FROM php:8.3.12-cli
+FROM php:8.3.13-cli
 
 ENV DEBIAN_FRONTEND=noninteractive
 ENV TERM=xterm-color
 
 ARG DEV_MODE
 ENV DEV_MODE=$DEV_MODE
 
-COPY --from=composer:2.8.1 /usr/bin/composer /usr/bin/
+COPY --from=composer:2.8.2 /usr/bin/composer /usr/bin/
 COPY ./rootfilesystem/ /
 
 RUN \

diff --git a/dockerfiles/nightly/php8.1/alpine/Dockerfile b/dockerfiles/nightly/php8.1/alpine/Dockerfile
@@ -1,6 +1,6 @@
 FROM php:8.1-cli-alpine3.20
 
-COPY --from=composer:2.8.1 /usr/bin/composer /usr/bin/
+COPY --from=composer:2.8.2 /usr/bin/composer /usr/bin/
 
 RUN \
     set -ex && \

diff --git a/dockerfiles/nightly/php8.1/cli/Dockerfile b/dockerfiles/nightly/php8.1/cli/Dockerfile
@@ -6,7 +6,7 @@ ENV TERM=xterm-color
 ARG DEV_MODE
 ENV DEV_MODE=$DEV_MODE
 
-COPY --from=composer:2.8.1 /usr/bin/composer /usr/bin/
+COPY --from=composer:2.8.2 /usr/bin/composer /usr/bin/
 COPY ./rootfilesystem/ /
 
 RUN \

diff --git a/dockerfiles/nightly/php8.2/alpine/Dockerfile b/dockerfiles/nightly/php8.2/alpine/Dockerfile
@@ -1,6 +1,6 @@
 FROM php:8.2-cli-alpine3.20
 
-COPY --from=composer:2.8.1 /usr/bin/composer /usr/bin/
+COPY --from=composer:2.8.2 /usr/bin/composer /usr/bin/
 
 RUN \
     set -ex && \

diff --git a/dockerfiles/nightly/php8.2/cli/Dockerfile b/dockerfiles/nightly/php8.2/cli/Dockerfile
@@ -6,7 +6,7 @@ ENV TERM=xterm-color
 ARG DEV_MODE
 ENV DEV_MODE=$DEV_MODE
 
-COPY --from=composer:2.8.1 /usr/bin/composer /usr/bin/
+COPY --from=composer:2.8.2 /usr/bin/composer /usr/bin/
 COPY ./rootfilesystem/ /
 
 RUN \

diff --git a/dockerfiles/nightly/php8.3/alpine/Dockerfile b/dockerfiles/nightly/php8.3/alpine/Dockerfile
@@ -1,6 +1,6 @@
 FROM php:8.3-cli-alpine3.20
 
-COPY --from=composer:2.8.1 /usr/bin/composer /usr/bin/
+COPY --from=composer:2.8.2 /usr/bin/composer /usr/bin/
 
 RUN \
     set -ex && \

diff --git a/dockerfiles/nightly/php8.3/cli/Dockerfile b/dockerfiles/nightly/php8.3/cli/Dockerfile
@@ -6,7 +6,7 @@ ENV TERM=xterm-color
 ARG DEV_MODE
 ENV DEV_MODE=$DEV_MODE
 
-COPY --from=composer:2.8.1 /usr/bin/composer /usr/bin/
+COPY --from=composer:2.8.2 /usr/bin/composer /usr/bin/
 COPY ./rootfilesystem/ /
 
 RUN \