fix(ci): revert workflow changes and just use a hosted runner for now

Author: calebevans

.github/workflows/build.yml

@@ -12,90 +12,62 @@ jobs:
   test-build:
     name: Test Build on Pull Request
     if: github.event_name == 'pull_request'
-    runs-on: self-hosted
+    runs-on: builder
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Build image for testing
-        uses: redhat-actions/buildah-build@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build Docker image for testing
+        uses: docker/build-push-action@v6
         with:
-          image: podmortem-log-parser-test
-          tags: latest
-          containerfiles: |
-            ./src/main/docker/Dockerfile.native
+          context: .
+          file: ./src/main/docker/Dockerfile.native
+          platforms: linux/amd64
+          push: false
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
           build-args: |
             GITHUB_USER=${{ github.actor }}
             GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}
 
   build-and-push:
     name: Build and Push on Main
     if: github.event_name == 'push' && github.ref == 'refs/heads/main'
-    runs-on: self-hosted
+    runs-on: builder
     permissions:
       contents: read
       packages: write
+
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Build AMD64 image
-        id: build-amd64
-        uses: redhat-actions/buildah-build@v2
-        with:
-          image: ghcr.io/${{ github.repository_owner }}/podmortem-log-parser
-          tags: latest-amd64 ${{ github.sha }}-amd64
-          containerfiles: |
-            ./src/main/docker/Dockerfile.native
-          build-args: |
-            GITHUB_USER=${{ github.actor }}
-            GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}
-            TARGETARCH=amd64
-            TARGETOS=linux
-
-      - name: Build ARM64 image
-        id: build-arm64
-        uses: redhat-actions/buildah-build@v2
-        with:
-          image: ghcr.io/${{ github.repository_owner }}/podmortem-log-parser
-          tags: latest-arm64 ${{ github.sha }}-arm64
-          containerfiles: |
-            ./src/main/docker/Dockerfile.native
-          build-args: |
-            GITHUB_USER=${{ github.actor }}
-            GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}
-            TARGETARCH=arm64
-            TARGETOS=linux
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
 
-      - name: Push AMD64 image
-        uses: redhat-actions/push-to-registry@v2
+      - name: Log in to the GitHub Container Registry
+        uses: docker/login-action@v3
         with:
-          image: ${{ steps.build-amd64.outputs.image }}
-          tags: ${{ steps.build-amd64.outputs.tags }}
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GH_PAT }}
 
-      - name: Push ARM64 image
-        uses: redhat-actions/push-to-registry@v2
+      - name: Build and push Docker image
+        id: build-and-push
+        uses: docker/build-push-action@v6
         with:
-          image: ${{ steps.build-arm64.outputs.image }}
-          tags: ${{ steps.build-arm64.outputs.tags }}
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GH_PAT }}
-
-      - name: Create and push manifest list
-        run: |
-          buildah manifest create ghcr.io/${{ github.repository_owner }}/podmortem-log-parser:latest
-          buildah manifest add ghcr.io/${{ github.repository_owner }}/podmortem-log-parser:latest ghcr.io/${{ github.repository_owner }}/podmortem-log-parser:latest-amd64
-          buildah manifest add ghcr.io/${{ github.repository_owner }}/podmortem-log-parser:latest ghcr.io/${{ github.repository_owner }}/podmortem-log-parser:latest-arm64
-          buildah manifest push --all ghcr.io/${{ github.repository_owner }}/podmortem-log-parser:latest docker://ghcr.io/${{ github.repository_owner }}/podmortem-log-parser:latest
-
-          buildah manifest create ghcr.io/${{ github.repository_owner }}/podmortem-log-parser:${{ github.sha }}
-          buildah manifest add ghcr.io/${{ github.repository_owner }}/podmortem-log-parser:${{ github.sha }} ghcr.io/${{ github.repository_owner }}/podmortem-log-parser:${{ github.sha }}-amd64
-          buildah manifest add ghcr.io/${{ github.repository_owner }}/podmortem-log-parser:${{ github.sha }} ghcr.io/${{ github.repository_owner }}/podmortem-log-parser:${{ github.sha }}-arm64
-          buildah manifest push --all ghcr.io/${{ github.repository_owner }}/podmortem-log-parser:${{ github.sha }} docker://ghcr.io/${{ github.repository_owner }}/podmortem-log-parser:${{ github.sha }}
+          context: .
+          file: ./src/main/docker/Dockerfile.native
+          platforms: linux/amd64,linux/arm64
+          push: true
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          tags: |
+            ghcr.io/${{ github.repository_owner }}/podmortem-log-parser:latest
+            ghcr.io/${{ github.repository_owner }}/podmortem-log-parser:${{ github.sha }}
+          build-args: |
+            GITHUB_USER=${{ github.actor }}
+            GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}

src/main/docker/Dockerfile.native

@@ -1,7 +1,4 @@
-ARG TARGETARCH
-ARG TARGETOS
-
-FROM registry.access.redhat.com/quarkus/mandrel-for-jdk-21-rhel8:23.1-${TARGETOS}.${TARGETARCH} AS build
+FROM registry.access.redhat.com/quarkus/mandrel-for-jdk-21-rhel8:23.1 AS build
 WORKDIR /home/quarkus
 
 COPY --chown=quarkus:quarkus mvnw .
@@ -18,7 +15,7 @@ ENV GITHUB_TOKEN=$GITHUB_TOKEN
 
 RUN ./mvnw --no-transfer-progress -s src/main/resources/settings.xml -U package -Dnative
 
-FROM registry.access.redhat.com/ubi9/ubi-minimal:latest.${TARGETOS}.${TARGETARCH}
+FROM registry.access.redhat.com/ubi9/ubi-minimal
 
 WORKDIR /work/
 COPY --from=build /home/quarkus/target/*-runner /work/application