Merge branch 'master' into 4.x

wodby · Nov 23, 2024 · 9538885 · 9538885
2 parents 0e29d4e + 2f126b3
commit 9538885
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 3 deletions.
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -21,6 +21,20 @@ env:
   BASE_IMAGE_STABILITY_TAG: 4.60.4
 
 jobs:
+  wordpress-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.WORDPRESS6 }}
+          php_ver: '8.4'
+          tags: 6-8.4,6-8,6,latest
+          platform: linux/amd64,linux/arm64
   wordpress-83:
     runs-on: ubuntu-latest
     steps:
@@ -33,7 +47,7 @@ jobs:
       with:
         version: ${{ env.WORDPRESS6 }}
         php_ver: '8.3'
-        tags: 6-8.3,6-8,6,latest
+        tags: 6-8.3
         platform: linux/amd64,linux/arm64
   wordpress-82:
     runs-on: ubuntu-latest

diff --git a/.wordpress-php b/.wordpress-php
@@ -1,3 +1,4 @@
+8.4#2024-11-23T02:30:22.132333Z
 8.3#2024-11-23T02:30:22.132333Z
 8.2#2024-11-23T02:30:22.132333Z
 8.1#2024-11-23T02:30:22.132333Z
diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ WORDPRESS_VER ?= 6.7.1
 
 WORDPRESS_VER_MAJOR ?= $(shell echo "${WORDPRESS_VER}" | grep -oE '^[0-9]+')
 
-PHP_VER ?= 8.3
+PHP_VER ?= 8.4
 BASE_IMAGE_TAG = $(PHP_VER)
 
 REPO = wodby/wordpress

diff --git a/README.md b/README.md
@@ -19,7 +19,8 @@ Overview:
 
 | Supported tags and respective `Dockerfile` links | WordPress | PHP |
 |--------------------------------------------------|-----------|-----|
-| `6-8.3`, `6-8`, `6`, `latest` [_(Dockerfile)_]   | 6         | 8.3 |
+| `6-8.4`, `6-8`, `6`, `latest` [_(Dockerfile)_]   | 6         | 8.4 |
+| `6-8.3` [_(Dockerfile)_]                         | 6         | 8.3 |
 | `6-8.2` [_(Dockerfile)_]                         | 6         | 8.2 |
 | `6-8.1` [_(Dockerfile)_]                         | 6         | 8.1 |