Merge branch 'PHP8.3'

eksponent · Dec 6, 2023 · b88add3 · b88add3
2 parents 127ae4a + 3813ede
commit b88add3
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml
@@ -33,8 +33,8 @@ jobs:
             tag: 8-2-fpm
           - image: eksponent/php8
             context: php8
-            dockerfile: Dockerfile-8-3-rc-fpm
-            tag: 8-3-rc-fpm
+            dockerfile: Dockerfile-8-3-fpm
+            tag: 8-3-fpm
           # PHP 7
           - image: eksponent/php7
             context: php7
@@ -63,8 +63,8 @@ jobs:
             tag: '8.2'
           - image: eksponent/php-with-supervisor-for-workers
             context: php-with-supervisor-for-workers
-            dockerfile: Dockerfile-8.3-rc
-            tag: '8.3-rc'
+            dockerfile: Dockerfile-8.3
+            tag: '8.3'
     steps:
       -
         name: Checkout

diff --git a/...-supervisor-for-workers/Dockerfile-8.3-rc → ...ith-supervisor-for-workers/Dockerfile-8.3 b/...-supervisor-for-workers/Dockerfile-8.3-rc → ...ith-supervisor-for-workers/Dockerfile-8.3
@@ -1,6 +1,6 @@
 ARG ARCH=${ARCH}
 
-FROM php:8.3-rc-cli
+FROM php:8.3-cli
 
 RUN pecl install mysql redis
 

diff --git a/php8/Dockerfile-8-1-fpm b/php8/Dockerfile-8-1-fpm
@@ -53,7 +53,7 @@ RUN "date"
 RUN echo "extension=redis.so" > /usr/local/etc/php/conf.d/redis.ini
 
 # Install Composer
-COPY --from=composer:2.5.4 /usr/bin/composer /usr/local/bin/composer
+COPY --from=composer:2.6.5 /usr/bin/composer /usr/local/bin/composer
 
 ADD entrypoint.sh /usr/local/bin/entrypoint.sh
 RUN chmod +x /usr/local/bin/entrypoint.sh

diff --git a/php8/Dockerfile-8-2-fpm b/php8/Dockerfile-8-2-fpm
@@ -53,7 +53,7 @@ RUN "date"
 RUN echo "extension=redis.so" > /usr/local/etc/php/conf.d/redis.ini
 
 # Install Composer
-COPY --from=composer:2.5.4 /usr/bin/composer /usr/local/bin/composer
+COPY --from=composer:2.6.5 /usr/bin/composer /usr/local/bin/composer
 
 ADD entrypoint.sh /usr/local/bin/entrypoint.sh
 RUN chmod +x /usr/local/bin/entrypoint.sh

diff --git a/php8/Dockerfile-8-3-rc-fpm → php8/Dockerfile-8-3-fpm b/php8/Dockerfile-8-3-rc-fpm → php8/Dockerfile-8-3-fpm
@@ -1,6 +1,6 @@
 ARG ARCH=${ARCH}
 
-FROM php:8.3-rc-fpm
+FROM php:8.3-fpm
 
 RUN pecl install mysql redis
 
@@ -53,7 +53,7 @@ RUN "date"
 RUN echo "extension=redis.so" > /usr/local/etc/php/conf.d/redis.ini
 
 # Install Composer
-COPY --from=composer:2.5.4 /usr/bin/composer /usr/local/bin/composer
+COPY --from=composer:2.6.5 /usr/bin/composer /usr/local/bin/composer
 
 ADD entrypoint.sh /usr/local/bin/entrypoint.sh
 RUN chmod +x /usr/local/bin/entrypoint.sh

diff --git a/php8/entrypoint.sh b/php8/entrypoint.sh
@@ -9,7 +9,7 @@ umask 002
 # We only want xdebug in specific circumstances so it's better to opt-in when we need it
 if [ -n "$ENABLE_XDEBUG" ]; then
     # Install and configure Xdebug, RUN is not used in entrypoint scripts
-    pecl install xdebug \
+    pecl install xdebug-3.2.2 \
         && docker-php-ext-enable xdebug \
         && touch /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \
         && sed -i '1 a xdebug.remote_autostart=true' /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \