Support to PHP 8.4, Arm64 and updated Alpine version (#141)

* Added support to PHP 8.4 and moved PHP 8.3 to stable * Run Actions * fix for imagemagick * fix for imagemagick * added support to arm64 * removed 8.1 --------- Co-authored-by: Felipe Hertzer <[email protected]>
lorisleiva · Dec 19, 2024 · 968c71f · 968c71f
1 parent acc90b3
commit 968c71f
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 23 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,23 +1,23 @@
 version: 2
 updates:
   - package-ecosystem: "docker"
-    directory: "/8.1"
+    directory: "/8.2"
     schedule:
       interval: "daily"
     ignore:
       - dependency-name: "*"
         update-types: ["version-update:semver-major"]
 
   - package-ecosystem: "docker"
-    directory: "/8.2"
+    directory: "/8.3"
     schedule:
       interval: "daily"
     ignore:
       - dependency-name: "*"
         update-types: ["version-update:semver-major"]
 
   - package-ecosystem: "docker"
-    directory: "/8.3"
+    directory: "/8.4"
     schedule:
       interval: "daily"
     ignore:

diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml
@@ -16,15 +16,15 @@ jobs:
       matrix:
         include:
           - tag: "latest"
-            php: "8.3"
+            php: "8.4"
           - tag: "stable"
-            php: "8.2"
+            php: "8.3"
+          - tag: "8.4"
+            php: "8.4"
           - tag: "8.3"
             php: "8.3"
           - tag: "8.2"
             php: "8.2"
-          - tag: "8.1"
-            php: "8.1"
 
     steps:
       - uses: actions/checkout@v3
@@ -42,12 +42,21 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+      - name: Setup QEMU for multi-platform builds
+        uses: docker/setup-qemu-action@v2
+        with:
+          platforms: linux/amd64,linux/arm64
+
+      - name: Setup Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
       - name: Build and push
         id: docker_build
         uses: docker/build-push-action@v3
         with:
           push: true
           context: ${{ matrix.php }}
+          platforms: linux/amd64,linux/arm64
           tags: |
             ghcr.io/${{ env.IMAGE }}:${{ matrix.tag }}
             ${{ env.IMAGE }}:${{ matrix.tag }}

diff --git a/8.2/Dockerfile b/8.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.2-alpine3.17
+FROM php:8.2-alpine3.21
 
 # Add docker-php-extension-installer script
 ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
@@ -32,8 +32,8 @@ RUN chmod +x /usr/local/bin/install-php-extensions && \
     install-php-extensions \
     @composer \
     redis-stable \
-    imagick-stable \
-    xdebug-stable \
+    imagick \
+    xdebug \
     bcmath \
     calendar \
     exif \

diff --git a/8.3/Dockerfile b/8.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.3-alpine3.17
+FROM php:8.3-alpine3.21
 
 # Add docker-php-extension-installer script
 ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
@@ -32,8 +32,8 @@ RUN chmod +x /usr/local/bin/install-php-extensions && \
     install-php-extensions \
     @composer \
     redis-stable \
-    imagick-stable \
-    xdebug-beta \
+    imagick \
+    xdebug \
     bcmath \
     calendar \
     exif \

diff --git a/8.1/Dockerfile → 8.4/Dockerfile b/8.1/Dockerfile → 8.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.1-alpine3.15
+FROM php:8.4-alpine3.21
 
 # Add docker-php-extension-installer script
 ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
@@ -32,8 +32,8 @@ RUN chmod +x /usr/local/bin/install-php-extensions && \
     install-php-extensions \
     @composer \
     redis-stable \
-    imagick-stable \
-    xdebug-stable \
+    imagick \
+    xdebug \
     bcmath \
     calendar \
     exif \

diff --git a/README.md b/README.md
@@ -4,13 +4,13 @@
 
 [![Docker Badge](https://img.shields.io/docker/pulls/lorisleiva/laravel-docker)](https://hub.docker.com/r/lorisleiva/laravel-docker/)
 
-| Tags   | PHP version | Features                                                                                                        |
-| ------ | ----------- | --------------------------------------------------------------------------------------------------------------- |
-| 8.1    | 8.1         | ✅ Everything.                                                                                                  |
-| 8.2    | 8.2         | ✅ Everything.                                                                                                  |
-| 8.3    | 8.3         | ⚠️ Everything but using `xdebug-beta` instead of `xdebug-stable`.                                               |
-| stable | **8.2**     | 🔗 Aliases the latest stable version of PHP that supports all features of this docker image.                    |
-| latest | **8.3**     | 🔗 Aliases the latest stable version of PHP available (even if that version does not support all features yet). |
+| Tags   | PHP version | Architecture | Features                                                                                                        |
+|--------|-------------|-------------|-----------------------------------------------------------------------------------------------------------------|
+| 8.2    | 8.2         | amd64/arm64 | ✅ Everything.                                                                                                   |
+| 8.3    | 8.3         | amd64/arm64 | ✅ Everything.                                                                                                   |
+| 8.4    | 8.4         | amd64/arm64 | ✅ Everything.                                                                                                   |
+| stable | **8.3**     | amd64/arm64 | 🔗 Aliases the latest stable version of PHP that supports all features of this docker image.                    |
+| latest | **8.4**     | amd64/arm64 | 🔗 Aliases the latest stable version of PHP available (even if that version does not support all features yet). |
 
 #### Use within your GitLab's pipelines.