create php 8.4 docker image

devgine · Dec 1, 2024 · 62cc027 · 62cc027
1 parent 0f01464
commit 62cc027
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 15 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -19,13 +19,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
+        php: ['8.4']
         composer: ['2']
-        latest: [false]
-        include:
-          - php: 8.3
-            composer: 2
-            latest: true
+        latest: [true]
+#        include:
+#          - php: 8.3
+#            composer: 2
+#            latest: true
     runs-on: ubuntu-latest
     name: "Composer v${{ matrix.composer }} PHP ${{ matrix.php }} package"
     steps:
@@ -72,7 +72,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
+        php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
         composer: ['2']
     needs: packaging
     runs-on: ubuntu-latest

diff --git a/Dockerfile b/Dockerfile
@@ -1,12 +1,15 @@
 ARG PHP_VERSION=8
 ARG COMPOSER_VERSION=2
 
-FROM composer:${COMPOSER_VERSION} as composer
+FROM composer:${COMPOSER_VERSION} AS composer
 
 FROM php:${PHP_VERSION}-fpm-alpine
 
-ENV PHP_VERSION $PHP_VERSION
-ENV COMPOSER_VERSION $COMPOSER_VERSION
+ARG PHP_VERSION
+ARG COMPOSER_VERSION
+
+ENV PHP_VERSION=$PHP_VERSION
+ENV COMPOSER_VERSION=$COMPOSER_VERSION
 
 ## XDEBUG
 RUN curl -sSLf \
@@ -18,9 +21,9 @@ COPY .docker/xdebug.ini $PHP_INI_DIR/conf.d/docker-php-ext-xdebug.ini
 ## END XDEBUG
 
 ## COMPOSER
-ENV COMPOSER_HOME /composer
-ENV COMPOSER_ALLOW_SUPERUSER 1
-ENV PATH /composer/vendor/bin:$PATH
+ENV COMPOSER_HOME=/composer
+ENV COMPOSER_ALLOW_SUPERUSER=1
+ENV PATH=/composer/vendor/bin:$PATH
 
 COPY --from=composer /usr/bin/composer /usr/bin/composer
 ## END COMPOSER

diff --git a/README.md b/README.md
@@ -23,8 +23,8 @@ Below is the list of docker images available by PHP versions:
 
 | PHP version | Docker image tags                               |
 |-------------|-------------------------------------------------|
-| PHP 8.4     | Coming soon (Waiting for xdebug 3.4)            |
-| PHP 8.3     | `ghcr.io/devgine/composer-php:latest`           |
+| PHP 8.4     | `ghcr.io/devgine/composer-php:latest`           |
+| PHP 8.3     | `ghcr.io/devgine/composer-php:v2-php8.3-alpine` |
 | PHP 8.2     | `ghcr.io/devgine/composer-php:v2-php8.2-alpine` |
 | PHP 8.1     | `ghcr.io/devgine/composer-php:v2-php8.1-alpine` |
 | PHP 8.0     | `ghcr.io/devgine/composer-php:v2-php8.0-alpine` |