FIx

2026-02-22 16:33:58 +01:00
parent 39f26ae755
commit fdb2ce8155
1 changed files with 60 additions and 48 deletions
@@ -9,48 +9,93 @@ on:
  schedule:
    - cron: "0 1 * * *"

+  workflow_dispatch:
+
 concurrency:
  group: docker-build-prod
  cancel-in-progress: true

 jobs:
-  publish:
+
+  # ─── APACHE ───────────────────────────────────────────────────────────────
+
+  build-apache-amd64:
+    runs-on: ubuntu-latest
+    permissions:
+      packages: write
+    container:
+      image: catthehacker/ubuntu:act-latest
+    outputs:
+      digest: ${{ steps.build.outputs.digest }}
+    steps:
+      - uses: actions/checkout@v3
+      - uses: docker/setup-buildx-action@v1
+      - uses: docker/login-action@v3
+        with:
+          registry: git.steelants.cz
+          username: ${{ secrets.GITEAUSER }}
+          password: ${{ secrets.GITEAPASSWD }}
+      - id: build
+        uses: docker/build-push-action@v6
+        with:
+          context: apache
+          platforms: linux/amd64
+          outputs: type=image,name=git.steelants.cz/steelants/docker_php_base,push-by-digest=true,name-canonical=true,push=true
+
+  build-apache-arm64:
+    runs-on: ubuntu-latest-arm
+    permissions:
+      packages: write
+    container:
+      image: catthehacker/ubuntu:act-latest
+    outputs:
+      digest: ${{ steps.build.outputs.digest }}
+    steps:
+      - uses: actions/checkout@v3
+      - uses: docker/setup-buildx-action@v1
+      - uses: docker/login-action@v3
+        with:
+          registry: git.steelants.cz
+          username: ${{ secrets.GITEAUSER }}
+          password: ${{ secrets.GITEAPASSWD }}
+      - id: build
+        uses: docker/build-push-action@v6
+        with:
+          context: apache
+          platforms: linux/arm64
+          outputs: type=image,name=git.steelants.cz/steelants/docker_php_base,push-by-digest=true,name-canonical=true,push=true
+
+  manifest-apache:
+    needs: [build-apache-amd64, build-apache-arm64]
    runs-on: ubuntu-latest
    permissions:
      packages: write
    container:
      image: catthehacker/ubuntu:act-latest
    steps:
-      - uses: actions/checkout@v3
-
      - uses: docker/setup-buildx-action@v1
-
      - uses: docker/login-action@v3
        with:
          registry: git.steelants.cz
          username: ${{ secrets.GITEAUSER }}
          password: ${{ secrets.GITEAPASSWD }}
+      - name: Create and push multi-arch manifest
+        run: |
+          docker buildx imagetools create -t git.steelants.cz/steelants/docker_php_base:latest \
+            git.steelants.cz/steelants/docker_php_base@${{ needs.build-apache-amd64.outputs.digest }} \
+            git.steelants.cz/steelants/docker_php_base@${{ needs.build-apache-arm64.outputs.digest }}

-      - uses: docker/build-push-action@v6
-        with:
-          context: apache
-          push: true
-          tags: git.steelants.cz/steelants/docker_php_base:latest
-
-      # ✅ Notifikace při úspěšném deploymentu
      - name: Discord Webhook Success
        if: success()
        uses: tsickert/discord-webhook@v6.0.0
        with:
          webhook-url: ${{ secrets.WEBHOOK_URL }}
          content: |
-            ✅ APACHE - Build successful!
+            ✅ APACHE - Build successful! (amd64 + arm64)
            Repo: ${{ github.repository }}
            Branch: ${{ github.ref_name }}
            Commit: ${{ github.sha }}
-            Version: ${{ env.release_version }}

-      # ❌ Notifikace při neúspěšném deploymentu
      - name: Discord Webhook Failure
        if: failure()
        uses: tsickert/discord-webhook@v6.0.0
@@ -61,36 +106,3 @@ jobs:
            Repo: ${{ github.repository }}
            Branch: ${{ github.ref_name }}
            Commit: ${{ github.sha }}
-            Version: ${{ env.release_version }}
-      
-      - uses: docker/build-push-action@v6
-        with:
-          context: fmp-alpine
-          push: true
-          tags: git.steelants.cz/steelants/docker_php_base:fpm-alpine-latest
-
-      # ✅ Notifikace při úspěšném deploymentu
-      - name: Discord Webhook Success
-        if: success()
-        uses: tsickert/discord-webhook@v6.0.0
-        with:
-          webhook-url: ${{ secrets.WEBHOOK_URL }}
-          content: |
-            ✅ FMP - ALPINE - Build successful!
-            Repo: ${{ github.repository }}
-            Branch: ${{ github.ref_name }}
-            Commit: ${{ github.sha }}
-            Version: ${{ env.release_version }}
-
-      # ❌ Notifikace při neúspěšném deploymentu
-      - name: Discord Webhook Failure
-        if: failure()
-        uses: tsickert/discord-webhook@v6.0.0
-        with:
-          webhook-url: ${{ secrets.WEBHOOK_URL }}
-          content: |
-            ❌ FMP - ALPINE - Build failed!
-            Repo: ${{ github.repository }}
-            Branch: ${{ github.ref_name }}
-            Commit: ${{ github.sha }}
-            Version: ${{ env.release_version }}