Parallelize Docker builds

They have diverged slightly making the build take longer as the cache
can't be leveraged. Rather than trying to keep them in sync just to make
good use of the build cache, we can build them in parallel.

Signed-off-by: Robert Young <[email protected]>

Author: robobario

.github/workflows/docker.yaml

@@ -25,6 +25,9 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        image: [proxy, operator]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -47,16 +50,31 @@ jobs:
         run: |
           RELEASE_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
           echo "release_version=${RELEASE_VERSION}" >> $GITHUB_OUTPUT
+           
+          if [[ "${{matrix.image}}" == "operator" ]]; then
+            CONTAINER_FILE="./Dockerfile.operator"
+          elif [[ "${{matrix.image}}" == "proxy" ]]; then
+            CONTAINER_FILE="./Dockerfile"
+          else
+            echo "Unknown matrix image: ${{matrix.image}}. Aborting build!"
+            exit 1
+          fi
+          echo "container_file=${CONTAINER_FILE}" >> $GITHUB_OUTPUT
 
           if [[ "${{ github.event_name }}" == "pull_request" || "${{ vars.REGISTRY_SERVER }}" == "" ]]; then
-            echo "proxy_tags=kroxylicious-proxy:${RELEASE_VERSION}" >> $GITHUB_OUTPUT
-            echo "operator_tags=kroxylicious-operator:${RELEASE_VERSION}" >> $GITHUB_OUTPUT
+            echo "image_tags=${{ matrix.image }}:${RELEASE_VERSION}" >> $GITHUB_OUTPUT
             echo "push_images=false" >> $GITHUB_OUTPUT
           else
-            PROXY_IMAGE="${{ vars.REGISTRY_SERVER }}/${{ vars.REGISTRY_ORGANISATION }}/${{ vars.PROXY_IMAGE_NAME }}"
-            OPERATOR_IMAGE="${{ vars.REGISTRY_SERVER }}/${{ vars.REGISTRY_ORGANISATION }}/${{ vars.OPERATOR_IMAGE_NAME }}"
-            echo "proxy_tags=${PROXY_IMAGE}:${RELEASE_VERSION}" >> $GITHUB_OUTPUT
-            echo "operator_tags=${OPERATOR_IMAGE}:${RELEASE_VERSION},${OPERATOR_IMAGE}:latest" >> $GITHUB_OUTPUT
+            if [[ "${{matrix.image}}" == "operator" ]]; then
+              OPERATOR_IMAGE="${{ vars.REGISTRY_SERVER }}/${{ vars.REGISTRY_ORGANISATION }}/${{ vars.OPERATOR_IMAGE_NAME }}"
+              echo "image_tags=${OPERATOR_IMAGE}:${RELEASE_VERSION},${OPERATOR_IMAGE}:latest" >> $GITHUB_OUTPUT
+            elif [[ "${{matrix.image}}" == "proxy" ]]; then
+              PROXY_IMAGE="${{ vars.REGISTRY_SERVER }}/${{ vars.REGISTRY_ORGANISATION }}/${{ vars.PROXY_IMAGE_NAME }}"
+              echo "image_tags=${PROXY_IMAGE}:${RELEASE_VERSION}" >> $GITHUB_OUTPUT
+            else
+              echo "Unknown matrix image: ${{matrix.image}}. Aborting build!"
+              exit 1
+            fi
             echo "push_images=true" >> $GITHUB_OUTPUT
           fi
 
@@ -68,27 +86,15 @@ jobs:
           username: ${{ vars.REGISTRY_USERNAME }}
           password: ${{ secrets.REGISTRY_TOKEN }}
 
-      - name: Build and maybe push Proxy image
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          platforms: linux/amd64,linux/arm64
-          push: ${{ steps.build_configuration.outputs.push_images == 'true' }}
-          build-args: |
-            KROXYLICIOUS_VERSION=${{ steps.build_configuration.outputs.release_version }}
-          tags: ${{ steps.build_configuration.outputs.proxy_tags }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max,compression=zstd
-
-      - name: Build and maybe push Operator image
+      - name: Build and maybe push ${{matrix.image}} image
         uses: docker/build-push-action@v6
         with:
           context: .
-          file: ./Dockerfile.operator
+          file: ${{ steps.build_configuration.outputs.container_file }}
           platforms: linux/amd64,linux/arm64
           push: ${{ steps.build_configuration.outputs.push_images == 'true' }}
           build-args: |
             KROXYLICIOUS_VERSION=${{ steps.build_configuration.outputs.release_version }}
-          tags: ${{ steps.build_configuration.outputs.operator_tags }}
+          tags: ${{ steps.build_configuration.outputs.image_tags }}
           cache-from: type=gha
           cache-to: type=gha,mode=max,compression=zstd