feat: add php 8.1.34 alpine3.22 build from ghcr base

.github/workflows/7.3.yml

@@ -54,6 +54,7 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
+        if: true
       - name: GHCR Login
         uses: docker/login-action@v1
         with:
@@ -67,6 +68,7 @@ jobs:
           set: |
             *.platform=linux/amd64,linux/arm,linux/arm64
           push: ${{ github.event_name == 'push' }}
+        if: true
       - name: GHCR build and push
         uses: docker/bake-action@v2
         env:

.github/workflows/7.4.yml

@@ -54,6 +54,7 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
+        if: true
       - name: GHCR Login
         uses: docker/login-action@v1
         with:
@@ -67,6 +68,7 @@ jobs:
           set: |
             *.platform=linux/amd64,linux/arm,linux/arm64
           push: ${{ github.event_name == 'push' }}
+        if: true
       - name: GHCR build and push
         uses: docker/bake-action@v2
         env:

.github/workflows/8.0.yml

@@ -54,6 +54,7 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
+        if: true
       - name: GHCR Login
         uses: docker/login-action@v1
         with:
@@ -67,6 +68,7 @@ jobs:
           set: |
             *.platform=linux/amd64,linux/arm,linux/arm64
           push: ${{ github.event_name == 'push' }}
+        if: true
       - name: GHCR build and push
         uses: docker/bake-action@v2
         env:

.github/workflows/8.1.yml

@@ -14,6 +14,9 @@ defaults:
   run:
     shell: 'bash -Eeuo pipefail -x {0}'
 
+permissions:
+  contents: read
+
 jobs:
   verify-templating:
     name: Verify templating
@@ -31,14 +34,14 @@ jobs:
     runs-on: ubuntu-latest
     needs:
       - verify-templating
+    permissions:
+      contents: read
+      packages: write
     strategy:
       matrix:
         target:
           [
-            "8_1_9-bullseye",
-            "8_1_9-buster",
-            "8_1_9-alpine3_16",
-            "8_1_9-alpine3_15",
+            "8_1_34-alpine3_22",
           ]
     steps:
       - name: Checkout
@@ -54,6 +57,7 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
+        if: false
       - name: GHCR Login
         uses: docker/login-action@v1
         with:
@@ -65,8 +69,9 @@ jobs:
         with:
           targets: ${{ matrix.target }}
           set: |
-            *.platform=linux/amd64,linux/arm,linux/arm64
+            *.platform=linux/amd64
           push: ${{ github.event_name == 'push' }}
+        if: false
       - name: GHCR build and push
         uses: docker/bake-action@v2
         env:
@@ -75,5 +80,5 @@ jobs:
         with:
           targets: ${{ matrix.target }}
           set: |
-            *.platform=linux/amd64,linux/arm,linux/arm64
+            *.platform=linux/amd64
           push: ${{ github.event_name == 'push' }}

.github/workflows/8.2.yml

@@ -54,6 +54,7 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
+        if: true
       - name: GHCR Login
         uses: docker/login-action@v1
         with:
@@ -67,6 +68,7 @@ jobs:
           set: |
             *.platform=linux/amd64,linux/arm,linux/arm64
           push: ${{ github.event_name == 'push' }}
+        if: true
       - name: GHCR build and push
         uses: docker/bake-action@v2
         env:

8.1/alpine3.15/Dockerfile → 8.1/alpine3.22/Dockerfile

@@ -1,6 +1,6 @@
 # NOTE: This file was generated via generate.sh. Don't edit it directly
 
-FROM sunasteriskrnd/php:8.1.9-nginx-alpine3.15
+FROM ghcr.io/sun-asterisk-research/php:8.1.34-nginx-alpine3.22@sha256:52414238eb01bf163d0df29bb7c10adb04559a89cdd9242c8794c35defe7e998
 
 ENV COMPOSER_VERSION=2.4.1
 

Dockerfile-00.template

@@ -1,4 +1,4 @@
-FROM sunasteriskrnd/php:{{ version }}-nginx-{{ distro_release }}
+FROM {{ base_image }}:{{ version }}-nginx-{{ distro_release }}{{ base_image_digest }}
 
 ENV COMPOSER_VERSION={{ composer_version }}
 

Makefile

@@ -1,13 +1,19 @@
 generate:
 	@./generate.sh
 	@for versions in $$(ls versions_*.yml); do \
-		APPEND=true ./generate.sh $$versions; \
+		APPEND=true ./generate.sh $$versions || exit 1; \
 	done
 
 clean:
 	@./generate.sh clean
-	@for versions in $$(versions_*.yml); do \
-		APPEND=true ./generate.sh clean $$versions; \
+	@for versions in $$(ls versions_*.yml); do \
+		APPEND=true ./generate.sh clean $$versions || exit 1; \
+	done
+
+# Validate every versions file first, so a bad one stops make all before anything is removed
+check:
+	@for versions in versions.yml $$(ls versions_*.yml); do \
+		./generate.sh check $$versions || exit 1; \
 	done
 
-all: clean generate
+all: check clean generate

ci.yml.template

@@ -12,7 +12,7 @@ defaults:
   run:
     shell: 'bash -Eeuo pipefail -x {0}'
 
-jobs:
+{{ workflow_permissions }}jobs:
   verify-templating:
     name: Verify templating
     runs-on: ubuntu-latest
@@ -29,7 +29,7 @@ jobs:
     runs-on: ubuntu-latest
     needs:
       - verify-templating
-    strategy:
+{{ docker_permissions }}    strategy:
       matrix:
         target:
           {{ targets }}
@@ -47,6 +47,7 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
+        if: {{ dockerhub_push }}
       - name: GHCR Login
         uses: docker/login-action@v1
         with:
@@ -60,6 +61,7 @@ jobs:
           set: |
             *.platform={{ platforms }}
           push: ${{ github.event_name == 'push' }}
+        if: {{ dockerhub_push }}
       - name: GHCR build and push
         uses: docker/bake-action@v2
         env:

docker-bake.hcl

@@ -142,82 +142,6 @@ target "8_0-alpine3_15" {
     inherits = ["8_0_22-alpine3_15"]
 }
 
-target "8_1_9-bullseye" {
-    context = "./8.1/bullseye"
-    cache-from = [
-        "${REGISTRY}/${REPO}:8.1-bullseye"
-    ]
-    tags = [
-        "${REGISTRY}/${REPO}:8-bullseye",
-        "${REGISTRY}/${REPO}:8",
-        "${REGISTRY}/${REPO}:8.1-bullseye",
-        "${REGISTRY}/${REPO}:8.1",
-        "${REGISTRY}/${REPO}:8.1.9-bullseye",
-        "${REGISTRY}/${REPO}:8.1.9",
-        "${REGISTRY}/${REPO}:bullseye",
-        "${REGISTRY}/${REPO}:latest",
-    ]
-}
-
-target "8_1-bullseye" {
-    inherits = ["8_1_9-bullseye"]
-}
-
-target "8_1_9-buster" {
-    context = "./8.1/buster"
-    cache-from = [
-        "${REGISTRY}/${REPO}:8.1-buster"
-    ]
-    tags = [
-        "${REGISTRY}/${REPO}:8-buster",
-        "${REGISTRY}/${REPO}:8.1-buster",
-        "${REGISTRY}/${REPO}:8.1.9-buster",
-        "${REGISTRY}/${REPO}:buster",
-    ]
-}
-
-target "8_1-buster" {
-    inherits = ["8_1_9-buster"]
-}
-
-target "8_1_9-alpine3_16" {
-    context = "./8.1/alpine3.16"
-    cache-from = [
-        "${REGISTRY}/${REPO}:8.1-alpine3.16"
-    ]
-    tags = [
-        "${REGISTRY}/${REPO}:8-alpine3.16",
-        "${REGISTRY}/${REPO}:8-alpine",
-        "${REGISTRY}/${REPO}:8.1-alpine3.16",
-        "${REGISTRY}/${REPO}:8.1-alpine",
-        "${REGISTRY}/${REPO}:8.1.9-alpine3.16",
-        "${REGISTRY}/${REPO}:8.1.9-alpine",
-        "${REGISTRY}/${REPO}:alpine3.16",
-        "${REGISTRY}/${REPO}:alpine",
-    ]
-}
-
-target "8_1-alpine3_16" {
-    inherits = ["8_1_9-alpine3_16"]
-}
-
-target "8_1_9-alpine3_15" {
-    context = "./8.1/alpine3.15"
-    cache-from = [
-        "${REGISTRY}/${REPO}:8.1-alpine3.15"
-    ]
-    tags = [
-        "${REGISTRY}/${REPO}:8-alpine3.15",
-        "${REGISTRY}/${REPO}:8.1-alpine3.15",
-        "${REGISTRY}/${REPO}:8.1.9-alpine3.15",
-        "${REGISTRY}/${REPO}:alpine3.15",
-    ]
-}
-
-target "8_1-alpine3_15" {
-    inherits = ["8_1_9-alpine3_15"]
-}
-
 target "7_3_33-bullseye" {
     context = "./7.3/bullseye"
     cache-from = [
@@ -282,6 +206,20 @@ target "7_3-alpine3_14" {
     inherits = ["7_3_33-alpine3_14"]
 }
 
+target "8_1_34-alpine3_22" {
+    context = "./8.1/alpine3.22"
+    cache-from = [
+        "${REGISTRY}/${REPO}:8.1-alpine3.22"
+    ]
+    tags = [
+        "${REGISTRY}/${REPO}:8.1.34-alpine3.22",
+    ]
+}
+
+target "8_1-alpine3_22" {
+    inherits = ["8_1_34-alpine3_22"]
+}
+
 target "8_2_1-bullseye" {
     context = "./8.2/bullseye"
     cache-from = [