Merge pull request #62 from shopware/add-matrix

Refactor workflows
shopware · Jan 30, 2024 · 5fa5729 · 5fa5729
2 parents 2f3021e + 1319684
commit 5fa5729
Show file tree

Hide file tree

Showing 17 changed files with 247 additions and 446 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -4,198 +4,96 @@ on:
   push:
     branches:
       - main
-    paths:
-      - "Dockerfile.template"
-      - ".github/workflows/build.yml"
-      - "rootfs/**"
+  pull_request:
 
 env:
   DOCKER_BUILDKIT: 1
   COSIGN_EXPERIMENTAL: 1
 
+
 permissions:
   contents: write
   id-token: write
   packages: write
 
 jobs:
-  php81-arm64:
-    name: 8.1 on ARM64
-    runs-on: hcloud-arm64-small
+  generate-matrix:
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.generate-matrix.outputs.matrix }}
     steps:
-      - uses: actions/checkout@v3
-
-      - name: Install Cosign
-        uses: sigstore/cosign-installer@v3
-
-      - name: Login into Docker Hub
-        run: echo "${{ secrets.DOCKER_HUB_PASSWORD }}" | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
-
-      - name: Login into Github Docker Registery
-        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - uses: docker/build-push-action@v4
-        with:
-          tags: ghcr.io/shopware/docker-base:8.1.26-arm64
-          context: .
-          file: 8.1/Dockerfile
-          cache-from: type=registry,ref=ghcr.io/shopware/docker-cache:8.1-arm64
-          cache-to: type=registry,ref=ghcr.io/shopware/docker-cache:8.1-arm64,mode=max
-          platforms: linux/arm64
-          push: true
-          provenance: false
+      - name: Checkout
+        uses: actions/checkout@v4
 
-  php81-amd64:
-      name: 8.1 on AMD64
-      runs-on: ubuntu-22.04
-      steps:
-        - uses: actions/checkout@v3
+      - name: Generate Matrix
+        id: generate-matrix
+        run: |
+          MATRIX=$(php matrix.php)
+          echo "matrix<<EOF" >> $GITHUB_OUTPUT
+          echo "$MATRIX" >> $GITHUB_OUTPUT
+          echo 'EOF' >> $GITHUB_OUTPUT
 
-        - name: Install Cosign
-          uses: sigstore/cosign-installer@v3
-
-        - name: Login into Github Docker Registery
-          run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
-
-        - name: Set up Docker Buildx
-          uses: docker/setup-buildx-action@v2
-
-        - uses: docker/build-push-action@v4
-          with:
-            tags: ghcr.io/shopware/docker-base:8.1.26-amd64
-            context: .
-            file: 8.1/Dockerfile
-            cache-from: type=registry,ref=ghcr.io/shopware/docker-cache:8.1-amd64
-            cache-to: type=registry,ref=ghcr.io/shopware/docker-cache:8.1-amd64,mode=max
-            platforms: linux/amd64
-            push: true
-            provenance: false
-
-  php82-arm64:
-    name: 8.2 on ARM64
-    runs-on: hcloud-arm64-small
+  build-fpm-amd64:
+    name: PHP FPM ${{ matrix.php }} on amd64
+    runs-on: ubuntu-latest
+    needs: [generate-matrix]
+    strategy: ${{ fromJson(needs.generate-matrix.outputs.matrix) }}
     steps:
-      - uses: actions/checkout@v3
-
-      - name: Install Cosign
-        uses: sigstore/cosign-installer@v3
+      - name: Checkout
+        uses: actions/checkout@v4
 
-      - name: Login into Docker Hub
-        run: echo "${{ secrets.DOCKER_HUB_PASSWORD }}" | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
-
       - name: Login into Github Docker Registery
         run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
-      - uses: docker/build-push-action@v4
+      - uses: docker/build-push-action@v5
         with:
-          tags: ghcr.io/shopware/docker-base:8.2.14-arm64
-          context: .
-          file: 8.2/Dockerfile
-          cache-from: type=registry,ref=ghcr.io/shopware/docker-cache:8.2-arm64
-          cache-to: type=registry,ref=ghcr.io/shopware/docker-cache:8.2-arm64,mode=max
-          platforms: linux/arm64
+          tags: ${{ matrix.fpm-image }}-amd64
+          context: fpm
+          cache-from: type=gha,scope=fpm-${{ matrix.php }}-amd64
+          cache-to: type=gha,mode=max,scope=fpm-${{ matrix.php }}-amd64
+          platforms: linux/amd64
+          build-args: |
+            PHP_PATCH_VERSION=${{ matrix.phpPatch }}
+            PHP_DIGEST=${{ matrix.phpPatchDigest }}
           push: true
           provenance: false
 
-  php82-amd64:
-      name: 8.2 on AMD64
-      runs-on: ubuntu-22.04
-      steps:
-        - uses: actions/checkout@v3
-
-        - name: Install Cosign
-          uses: sigstore/cosign-installer@v3
-
-        - name: Login into Github Docker Registery
-          run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
-
-        - name: Set up Docker Buildx
-          uses: docker/setup-buildx-action@v2
-
-        - uses: docker/build-push-action@v4
-          with:
-            tags: ghcr.io/shopware/docker-base:8.2.14-amd64
-            context: .
-            file: 8.2/Dockerfile
-            cache-from: type=registry,ref=ghcr.io/shopware/docker-cache:8.2-amd64
-            cache-to: type=registry,ref=ghcr.io/shopware/docker-cache:8.2-amd64,mode=max
-            platforms: linux/amd64
-            push: true
-            provenance: false
-
-  php83-arm64:
-    name: 8.3 on ARM64
+  build-fpm-arm64:
+    name: PHP FPM ${{ matrix.php }} on arm64
     runs-on: hcloud-arm64-small
+    needs: [generate-matrix]
+    strategy: ${{ fromJson(needs.generate-matrix.outputs.matrix) }}
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v4
 
-      - name: Install Cosign
-        uses: sigstore/cosign-installer@v3
-
-      - name: Login into Docker Hub
-        run: echo "${{ secrets.DOCKER_HUB_PASSWORD }}" | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
-
       - name: Login into Github Docker Registery
         run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
-      - uses: docker/build-push-action@v4
+      - uses: docker/build-push-action@v5
         with:
-          tags: ghcr.io/shopware/docker-base:8.3.1-arm64
-          context: .
-          file: 8.3/Dockerfile
-          cache-from: type=registry,ref=ghcr.io/shopware/docker-cache:8.3-arm64
-          cache-to: type=registry,ref=ghcr.io/shopware/docker-cache:8.3-arm64,mode=max
+          tags: ${{ matrix.fpm-image }}-arm64
+          context: fpm
+          cache-from: type=gha,scope=fpm-${{ matrix.php }}-arm64
+          cache-to: type=gha,mode=max,scope=fpm-${{ matrix.php }}-arm64
           platforms: linux/arm64
+          build-args: |
+            PHP_PATCH_VERSION=${{ matrix.phpPatch }}
+            PHP_DIGEST=${{ matrix.phpPatchDigest }}
           push: true
           provenance: false
 
-  php83-amd64:
-      name: 8.3 on AMD64
-      runs-on: ubuntu-22.04
-      steps:
-        - uses: actions/checkout@v3
-
-        - name: Install Cosign
-          uses: sigstore/cosign-installer@v3
-
-        - name: Login into Github Docker Registery
-          run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
-
-        - name: Set up Docker Buildx
-          uses: docker/setup-buildx-action@v2
-
-        - uses: docker/build-push-action@v4
-          with:
-            tags: ghcr.io/shopware/docker-base:8.3.1-amd64
-            context: .
-            file: 8.3/Dockerfile
-            cache-from: type=registry,ref=ghcr.io/shopware/docker-cache:8.3-amd64
-            cache-to: type=registry,ref=ghcr.io/shopware/docker-cache:8.3-amd64,mode=max
-            platforms: linux/amd64
-            push: true
-            provenance: false
-
-
-  merge-manifest:
-    name: Merge Manifest
+  fpm-merge:
+    name: Generate Docker Manifest for PHP ${{ matrix.php }}
     runs-on: ubuntu-latest
-    needs:
-      - php81-arm64
-      - php81-amd64
-      - php82-arm64
-      - php82-amd64
-      - php83-arm64
-      - php83-amd64
-
+    needs: [generate-matrix, build-fpm-amd64, build-fpm-arm64]
+    strategy: ${{ fromJson(needs.generate-matrix.outputs.matrix) }}
     steps:
       - name: Login into Docker Hub
         run: echo "${{ secrets.DOCKER_HUB_PASSWORD }}" | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
@@ -211,51 +109,90 @@ jobs:
           wget https://github.com/regclient/regclient/releases/latest/download/regctl-linux-amd64
           chmod +x regctl-linux-amd64
 
-      - run: docker manifest create ghcr.io/shopware/docker-base:8.1 --amend ghcr.io/shopware/docker-base:8.1.26-amd64 --amend ghcr.io/shopware/docker-base:8.1.26-arm64
-
-      - run: docker manifest create ghcr.io/shopware/docker-base:8.1.26 --amend ghcr.io/shopware/docker-base:8.1.26-amd64 --amend ghcr.io/shopware/docker-base:8.1.26-arm64
-
-      - run: docker manifest push ghcr.io/shopware/docker-base:8.1
-
-      - run: docker manifest push ghcr.io/shopware/docker-base:8.1.26
-
-      - run: cosign sign --yes ghcr.io/shopware/docker-base:8.1
-
-      - run: cosign sign --yes ghcr.io/shopware/docker-base:8.1.26
-
-      - run: ./regctl-linux-amd64 image copy ghcr.io/shopware/docker-base:8.1 shopware/docker-base:8.1
+      - run: docker manifest create ${{ matrix.fpm-image }} --amend ${{ matrix.fpm-image }}-amd64 --amend ${{ matrix.fpm-image }}-arm64
 
-      - run: ./regctl-linux-amd64 image copy ghcr.io/shopware/docker-base:8.1.26 shopware/docker-base:8.1.26
+      - run: docker manifest push ${{ matrix.fpm-image }}
 
-      - run: docker manifest create ghcr.io/shopware/docker-base:8.2 --amend ghcr.io/shopware/docker-base:8.2.14-amd64 --amend ghcr.io/shopware/docker-base:8.2.14-arm64
+      - run: cosign sign --yes ${{ matrix.fpm-image }}
 
-      - run: docker manifest create ghcr.io/shopware/docker-base:8.2.14 --amend ghcr.io/shopware/docker-base:8.2.14-amd64 --amend ghcr.io/shopware/docker-base:8.2.14-arm64
+      - run: docker manifest create ${{ matrix.fpm-patch-image }} --amend ${{ matrix.fpm-image }}-amd64 --amend ${{ matrix.fpm-image }}-arm64
 
-      - run: docker manifest push ghcr.io/shopware/docker-base:8.2
+      - run: docker manifest push ${{ matrix.fpm-patch-image }}
 
-      - run: docker manifest push ghcr.io/shopware/docker-base:8.2.14
+      - run: cosign sign --yes ${{ matrix.fpm-patch-image }}
 
-      - run: cosign sign --yes ghcr.io/shopware/docker-base:8.2
+      - if: github.ref == 'refs/heads/main'
+        run: ./regctl-linux-amd64 image copy ${{ matrix.fpm-image }} ${{ matrix.fpm-hub-image }}
 
-      - run: cosign sign --yes ghcr.io/shopware/docker-base:8.2.14
-
-      - run: ./regctl-linux-amd64 image copy ghcr.io/shopware/docker-base:8.2 shopware/docker-base:8.2
-
-      - run: ./regctl-linux-amd64 image copy ghcr.io/shopware/docker-base:8.2.14 shopware/docker-base:8.2.14
-
-      - run: docker manifest create ghcr.io/shopware/docker-base:8.3 --amend ghcr.io/shopware/docker-base:8.3.1-amd64 --amend ghcr.io/shopware/docker-base:8.3.1-arm64
-
-      - run: docker manifest create ghcr.io/shopware/docker-base:8.3.1 --amend ghcr.io/shopware/docker-base:8.3.1-amd64 --amend ghcr.io/shopware/docker-base:8.3.1-arm64
-
-      - run: docker manifest push ghcr.io/shopware/docker-base:8.3
+      - if: github.ref == 'refs/heads/main'
+        run: ./regctl-linux-amd64 image copy ${{ matrix.fpm-patch-image }} ${{ matrix.fpm-patch-hub-image }}
+
+  caddy:
+    name: Build Caddy ${{ matrix.php }}
+    runs-on: ubuntu-latest
+    needs: [generate-matrix, fpm-merge]
+    strategy: ${{ fromJson(needs.generate-matrix.outputs.matrix) }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
 
-      - run: docker manifest push ghcr.io/shopware/docker-base:8.3.1
+      - name: Login into Github Docker Registery
+        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
 
-      - run: cosign sign --yes ghcr.io/shopware/docker-base:8.3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
 
-      - run: cosign sign --yes ghcr.io/shopware/docker-base:8.3.1
+      - uses: docker/build-push-action@v5
+        with:
+          tags: |
+            ${{ matrix.caddy-tags }}
+          context: caddy
+          cache-from: type=registry,ref=ghcr.io/shopware/docker-cache:${{ matrix.php }}-caddy
+          cache-to: type=registry,ref=ghcr.io/shopware/docker-cache:${{ matrix.php }}-caddy,mode=max
+          platforms: linux/amd64,linux/arm64
+          build-args: |
+            PHP_PATCH_VERSION=${{ matrix.phpPatch }}
+            PHP_DIGEST=${{ matrix.phpPatchDigest }}
+            SUPERVISORD_DIGEST=${{ matrix.supervisordDigest }}
+          push: true
+          provenance: false
 
-      - run: ./regctl-linux-amd64 image copy ghcr.io/shopware/docker-base:8.3 shopware/docker-base:8.3
+  check:
+    name: Test Image
+    runs-on: ubuntu-latest
+    needs: [caddy]
+    steps:
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
 
-      - run: ./regctl-linux-amd64 image copy ghcr.io/shopware/docker-base:8.3.1 shopware/docker-base:8.3.1
+      - name: Checkout example repo
+        uses: actions/checkout@v4
+        with:
+          repository: shopwareLabs/example-docker-repository
 
+      - name: Build
+        id: build
+        uses: docker/build-push-action@v5
+        with:
+          push: false
+          load: true
+          build-args: |
+            BASE_IMAGE=ghcr.io/shopware/docker-base:${{ github.run_id }}-8.3-caddy
+          context: .
+          file: Dockerfile
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+      - name: Run image
+        env:
+          DOCKER_BUILDKIT: 0
+        run: docker compose up -d --wait
+
+      - name: Check if shopware is running
+        run: curl --fail localhost:8000/admin
+
+      # output logs if failed
+      - name: Output logs
+        working-directory: example-repo
+        run: docker compose logs
+        if: ${{ failure() }}