From 4ad9889cede5a98d91f2cafbf0e3c40e5ccae3ef Mon Sep 17 00:00:00 2001
From: Demin Yin <deminy@deminy.net>
Date: Tue, 29 Oct 2024 10:10:57 -0700
Subject: [PATCH] upgrade PHP and Composer in latest images

---
 config/5.1.5.yml                                | 6 +++---
 config/6.0.0-beta.yml                           | 6 +++---
 config/nightly.yml                              | 2 +-
 dockerfiles/5.1.5/php8.0/alpine/Dockerfile      | 2 +-
 dockerfiles/5.1.5/php8.0/cli/Dockerfile         | 2 +-
 dockerfiles/5.1.5/php8.1/alpine/Dockerfile      | 2 +-
 dockerfiles/5.1.5/php8.1/cli/Dockerfile         | 2 +-
 dockerfiles/5.1.5/php8.2/alpine/Dockerfile      | 4 ++--
 dockerfiles/5.1.5/php8.2/cli/Dockerfile         | 4 ++--
 dockerfiles/5.1.5/php8.3/alpine/Dockerfile      | 4 ++--
 dockerfiles/5.1.5/php8.3/cli/Dockerfile         | 4 ++--
 dockerfiles/6.0.0-beta/php8.0/alpine/Dockerfile | 2 +-
 dockerfiles/6.0.0-beta/php8.0/cli/Dockerfile    | 2 +-
 dockerfiles/6.0.0-beta/php8.1/alpine/Dockerfile | 2 +-
 dockerfiles/6.0.0-beta/php8.1/cli/Dockerfile    | 2 +-
 dockerfiles/6.0.0-beta/php8.2/alpine/Dockerfile | 4 ++--
 dockerfiles/6.0.0-beta/php8.2/cli/Dockerfile    | 4 ++--
 dockerfiles/6.0.0-beta/php8.3/alpine/Dockerfile | 4 ++--
 dockerfiles/6.0.0-beta/php8.3/cli/Dockerfile    | 4 ++--
 dockerfiles/nightly/php8.1/alpine/Dockerfile    | 2 +-
 dockerfiles/nightly/php8.1/cli/Dockerfile       | 2 +-
 dockerfiles/nightly/php8.2/alpine/Dockerfile    | 2 +-
 dockerfiles/nightly/php8.2/cli/Dockerfile       | 2 +-
 dockerfiles/nightly/php8.3/alpine/Dockerfile    | 2 +-
 dockerfiles/nightly/php8.3/cli/Dockerfile       | 2 +-
 25 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/config/5.1.5.yml b/config/5.1.5.yml
index 89c6b928..365596e3 100644
--- 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
index ebd54840..c86f1933 100644
--- 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
index 5c79ecfa..555998f6 100644
--- 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
index 91807329..9fd011e5 100644
--- 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
index 6c268f68..e46575c4 100644
--- 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
index 2d8f74da..7e1f8794 100644
--- 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
index fd036dc9..fe684c72 100644
--- 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
index c432dd14..cd03825e 100644
--- 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
index 20e9e321..bcad03a4 100644
--- a/dockerfiles/5.1.5/php8.2/cli/Dockerfile
+++ b/dockerfiles/5.1.5/php8.2/cli/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.2.24-cli
+FROM php:8.2.25-cli
 
 ENV DEBIAN_FRONTEND=noninteractive
 ENV TERM=xterm-color
@@ -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.3/alpine/Dockerfile b/dockerfiles/5.1.5/php8.3/alpine/Dockerfile
index 8526ecdc..69f7c740 100644
--- 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
index 15d1407a..7071c57f 100644
--- a/dockerfiles/5.1.5/php8.3/cli/Dockerfile
+++ b/dockerfiles/5.1.5/php8.3/cli/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.3.12-cli
+FROM php:8.3.13-cli
 
 ENV DEBIAN_FRONTEND=noninteractive
 ENV TERM=xterm-color
@@ -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.0/alpine/Dockerfile b/dockerfiles/6.0.0-beta/php8.0/alpine/Dockerfile
index fd0d8674..897ceec5 100644
--- 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
index e802bd1c..8555b6b2 100644
--- 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
index 9b58fe5d..3a62746d 100644
--- 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
index 5836975f..79923b70 100644
--- 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
index 53214c08..333c2b71 100644
--- 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
index 24174c5a..78e62cbb 100644
--- a/dockerfiles/6.0.0-beta/php8.2/cli/Dockerfile
+++ b/dockerfiles/6.0.0-beta/php8.2/cli/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.2.24-cli
+FROM php:8.2.25-cli
 
 ENV DEBIAN_FRONTEND=noninteractive
 ENV TERM=xterm-color
@@ -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.3/alpine/Dockerfile b/dockerfiles/6.0.0-beta/php8.3/alpine/Dockerfile
index db6dfde9..342bae29 100644
--- 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
index efdc36c1..9d9ddbad 100644
--- a/dockerfiles/6.0.0-beta/php8.3/cli/Dockerfile
+++ b/dockerfiles/6.0.0-beta/php8.3/cli/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.3.12-cli
+FROM php:8.3.13-cli
 
 ENV DEBIAN_FRONTEND=noninteractive
 ENV TERM=xterm-color
@@ -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.1/alpine/Dockerfile b/dockerfiles/nightly/php8.1/alpine/Dockerfile
index e4fa6196..ea5cf46b 100644
--- 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
index 2f940fc7..a31f8510 100644
--- 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
index 89b8a222..1726f0bc 100644
--- 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
index 3cf6ea65..f495490a 100644
--- 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
index c6207f6b..4a816416 100644
--- 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
index 29acb2b8..c600f38e 100644
--- 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 \