Add php 8.4

wodby · Nov 23, 2024 · 1d87e19 · 1d87e19
1 parent 0a12e70
commit 1d87e19
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 6 deletions.
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -19,6 +19,21 @@ env:
   DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
 
 jobs:
+  drupal-11-84:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: docker/setup-qemu-action@v3
+        with:
+          platforms: amd64,arm64
+      - uses: docker/setup-buildx-action@v3
+      - uses: ./.github/actions
+        with:
+          version: ${{ env.DRUPAL11 }}
+          php_ver: '8.4'
+          tags: 11-8.4,11-8,11,latest
+          workdir: '11'
+          platform: linux/amd64,linux/arm64  
   drupal-11-83:
     runs-on: ubuntu-latest
     steps:
@@ -31,10 +46,25 @@ jobs:
       with:
         version: ${{ env.DRUPAL11 }}
         php_ver: '8.3'
-        tags: 11-8.3,11-8,11,latest
+        tags: 11-8.3
         workdir: '11'
         platform: linux/amd64,linux/arm64
   # drupal 10
+  drupal-10-84:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: docker/setup-qemu-action@v3
+        with:
+          platforms: amd64,arm64
+      - uses: docker/setup-buildx-action@v3
+      - uses: ./.github/actions
+        with:
+          version: ${{ env.DRUPAL10 }}
+          php_ver: '8.4'
+          tags: 10-8.4,10-8,10
+          workdir: '10'
+          platform: linux/amd64,linux/arm64
   drupal-10-83:
     runs-on: ubuntu-latest
     steps:
@@ -47,7 +77,7 @@ jobs:
       with:
         version: ${{ env.DRUPAL10 }}
         php_ver: '8.3'
-        tags: 10-8.3,10-8,10
+        tags: 10-8.3
         workdir: '10'
         platform: linux/amd64,linux/arm64
   drupal-10-82:

diff --git a/10/Makefile b/10/Makefile
@@ -1,7 +1,7 @@
 DRUPAL_VER ?= 10.3.10
 DRUPAL_VER_MAJOR ?= $(shell echo "${DRUPAL_VER}" | grep -oE '^[0-9]+')
 
-PHP_VER ?= 8.3
+PHP_VER ?= 8.4
 BASE_IMAGE_TAG = $(PHP_VER)
 
 REPO = wodby/drupal

diff --git a/11/Makefile b/11/Makefile
@@ -1,7 +1,7 @@
 DRUPAL_VER ?= 11.0.9
 DRUPAL_VER_MAJOR ?= $(shell echo "${DRUPAL_VER}" | grep -oE '^[0-9]+')
 
-PHP_VER ?= 8.3
+PHP_VER ?= 8.4
 BASE_IMAGE_TAG = $(PHP_VER)
 
 REPO = wodby/drupal

diff --git a/README.md b/README.md
@@ -18,8 +18,10 @@ Overview:
 
 | Supported tags and respective `Dockerfile` links                                                             | Drupal | PHP |
 |--------------------------------------------------------------------------------------------------------------|--------|-----|
-| `11-8.3`, `11-8`, `11`, `latest` [_(Dockerfile)_](https://github.com/wodby/drupal/tree/master/11/Dockerfile) | 11     | 8.3 |
-| `10-8.3`, `10-8`, `10` [_(Dockerfile)_](https://github.com/wodby/drupal/tree/master/10/Dockerfile)           | 10     | 8.3 |
+| `11-8.4`, `11-8`, `11`, `latest` [_(Dockerfile)_](https://github.com/wodby/drupal/tree/master/11/Dockerfile) | 11     | 8.4 |
+| `11-8.3` [_(Dockerfile)_](https://github.com/wodby/drupal/tree/master/11/Dockerfile)                         | 11     | 8.3 |
+| `10-8.4`, `10-8`, `10` [_(Dockerfile)_](https://github.com/wodby/drupal/tree/master/10/Dockerfile)           | 10     | 8.4 |
+| `10-8.3` [_(Dockerfile)_](https://github.com/wodby/drupal/tree/master/10/Dockerfile)                         | 10     | 8.3 |
 | `10-8.2` [_(Dockerfile)_](https://github.com/wodby/drupal/tree/master/10/Dockerfile)                         | 10     | 8.2 |
 | `10-8.1` [_(Dockerfile)_](https://github.com/wodby/drupal/tree/master/10/Dockerfile)                         | 10     | 8.1 |
 | `7-8.2`, `7-8`, `7` [_(Dockerfile)_](https://github.com/wodby/drupal/tree/master/7/Dockerfile)               | 7      | 8.2 |