Merge branch 'master' into dev

.github/workflows/build.yml

@@ -6,7 +6,7 @@ on:
   workflow_dispatch:
     inputs:
       legacy:
-        description: 'Also build legacy images (7.2, 7.3, 7.4, 8.0, 8.1)'
+        description: 'Also build legacy images (7.2, 7.3, 7.4, 8.0)'
         required: false
         default: false
         type: boolean
@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ["8.2", "8.3", "8.4", "8.5"]
+        php: ["8.1", "8.2", "8.3", "8.4", "8.5"]
         variant: ["debian", "alpine"]
     steps:
       - uses: actions/checkout@v7
@@ -49,7 +49,7 @@ jobs:
           echo "file=${file}" >> "$GITHUB_OUTPUT"
           echo "tags=${tags}" >> "$GITHUB_OUTPUT"
       - name: Build and push ${{ matrix.php }} ${{ matrix.variant }}
-        uses: docker/build-push-action@v7
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ${{ steps.meta.outputs.file }}
@@ -68,17 +68,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        include:
+        php: ["7.2", "7.3", "7.4", "8.0"]
-          - { tag: "7.2", phpVersion: "7.2", file: ./src/docker/7.2/Dockerfile, platforms: linux/amd64 }
-          - { tag: "7.3", phpVersion: "7.3", file: ./src/docker/7.3/Dockerfile, platforms: linux/amd64 }
-          - { tag: "7.4", phpVersion: "7.4", file: ./src/docker/7.4/Dockerfile, platforms: linux/amd64 }
-          - { tag: "8.0", phpVersion: "8.0", file: ./src/docker/8.0/Dockerfile, platforms: linux/amd64 }
-          - { tag: "8.1", phpVersion: "8.1", file: ./src/docker/Dockerfile, platforms: "linux/amd64,linux/arm64" }
-          - { tag: "8.1-alpine", phpVersion: "8.1", file: ./src/docker/Dockerfile.alpine, platforms: "linux/amd64,linux/arm64" }
     steps:
       - uses: actions/checkout@v7
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v4
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v4
       - name: Login to DockerHub
@@ -86,13 +78,10 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Build and push ${{ matrix.tag }}
+      - name: Build and push ${{ matrix.php }}
-        uses: docker/build-push-action@v7
+        uses: docker/build-push-action@v6
         with:
           context: .
-          file: ${{ matrix.file }}
+          file: ./src/docker/${{ matrix.php }}/Dockerfile
           push: true
-          platforms: ${{ matrix.platforms }}
+          tags: ${{ vars.BUILDKIT_IMAGE }}:${{ matrix.php }}
-          build-args: |
-            phpVersion=${{ matrix.phpVersion }}
-          tags: ${{ vars.BUILDKIT_IMAGE }}:${{ matrix.tag }}

.github/workflows/tests.yml

@@ -9,14 +9,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ["8.2", "8.3", "8.4", "8.5"]
+        php: ["8.1", "8.2", "8.3", "8.4", "8.5"]
         variant: ["debian", "alpine"]
     steps:
       - uses: actions/checkout@v7
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v4
       - name: Build Docker image
-        uses: docker/build-push-action@v7
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ${{ matrix.variant == 'alpine' && './src/docker/Dockerfile.alpine' || './src/docker/Dockerfile' }}

Makefile

@@ -1,5 +1,5 @@
 IMAGE_NAME?=jkaninda/laravel-php-fpm
-PHP_VERSIONS?=8.2 8.3 8.4 8.5
+PHP_VERSIONS?=8.1 8.2 8.3 8.4 8.5
 LATEST_PHP?=8.5
 
 .PHONY: all
@@ -17,8 +17,7 @@ build-latest: build-$(LATEST_PHP) build-$(LATEST_PHP)-alpine
 	docker tag ${IMAGE_NAME}:$(LATEST_PHP) ${IMAGE_NAME}:latest
 	docker tag ${IMAGE_NAME}:$(LATEST_PHP)-alpine ${IMAGE_NAME}:alpine
 
-# Legacy images (7.2, 7.3, 7.4, 8.0). PHP 8.1 is legacy too but uses the
+# Legacy images (7.2, 7.3, 7.4, 8.0)
-# shared Dockerfiles: make build-8.1 / make build-8.1-alpine
 .PHONY: build-7.2 build-7.3 build-7.4 build-8.0
 build-7.2 build-7.3 build-7.4 build-8.0: build-%:
 	docker build -f src/docker/$*/Dockerfile -t ${IMAGE_NAME}:$* .

README.md

@@ -43,8 +43,12 @@ This image is ideal for developers looking for a streamlined, high-performance s
 | 8.4 | `8.4` | `8.4-alpine` |
 | 8.3 | `8.3` | `8.3-alpine` |
 | 8.2 | `8.2` | `8.2-alpine` |
+| 8.1 | `8.1` | `8.1-alpine` |
 
-Legacy images (PHP is end-of-life, no longer rebuilt automatically or tested): `8.1`, `8.1-alpine`, `8.0`, `7.4`, `7.3`, `7.2`.
+Legacy images (no longer rebuilt automatically, PHP is end-of-life): `8.0`, `7.4`, `7.3`, `7.2`.
+
+> [!NOTE]
+> PHP 8.1 is end-of-life upstream. The image is still built, but please plan an upgrade.
 
 ---