ci: switch to docker buildx (rh-ecosystem-edge#1045)

klaskosk · web-flow · commit 0ba17b4f9422 · 2026-01-08T17:03:50.000-05:00
The existing buildah actions seem to be unmaintained and are now
failing. This commit switches to using the docker versions since they
should work as expected and be better maintained.

Additionally, the dockerfile has been updated to use a multi-stage build
and extract Go using the native platform.

Finally, the go version in the Dockerfile now matches go.mod.
diff --git a/.github/workflows/docker-image-ci.yml b/.github/workflows/docker-image-ci.yml
@@ -18,9 +18,19 @@ jobs:
     steps:
     - uses: actions/checkout@v6
 
+    - name: Login to Quay.io
+      uses: docker/login-action@v3
+      with:
+        registry: quay.io
+        username: ${{ secrets.OCP_EDGE_QE_QUAY_USER }}
+        password: ${{ secrets.OCP_EDGE_QE_QUAY }}
+
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v3
 
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+
     - name: Set image tag
       shell: bash
       run: |
@@ -33,55 +43,20 @@ jobs:
         echo "IMAGE_TAG=${image_tag}" >> $GITHUB_OUTPUT
       id: set_image_tag
 
-    - name: Build docker image
-      id: build-image
-      uses: redhat-actions/buildah-build@v2
-      with:
-        image: eco-gotests
-        tags: ${{ steps.set_image_tag.outputs.IMAGE_TAG }}
-        containerfiles: |
-          ./Dockerfile
-        archs: amd64, arm64
-
-    - name: Push To quay.io
-      id: push-to-quay
-      uses: redhat-actions/push-to-registry@v2
-      with:
-        image: ${{ steps.build-image.outputs.image }}
-        tags: ${{ steps.build-image.outputs.tags }}
-        registry: quay.io/ocp-edge-qe
-        username: ${{ secrets.OCP_EDGE_QE_QUAY_USER }}
-        password: ${{ secrets.OCP_EDGE_QE_QUAY }}
-
-    - name: Print image url
-      run: echo "Image pushed to ${{ steps.push-to-quay.outputs.registry-paths }}"
-
-    - name: Log in to Registry
-      uses: redhat-actions/podman-login@v1
-      with:
-        registry: quay.io/ocp-edge-qe/eco-gotests
-        username: ${{ secrets.OCP_EDGE_QE_QUAY_USER }}
-        password: ${{ secrets.OCP_EDGE_QE_QUAY }}
-
-    - name: Build docker eco-gotests-ran-du image
-      id: build-image-system
-      uses: redhat-actions/buildah-build@v2
+    - name: Build and push eco-gotests
+      uses: docker/build-push-action@v6
       with:
-        image: eco-gotests-ran-du
-        tags: ${{ steps.set_image_tag.outputs.IMAGE_TAG }}
-        containerfiles: |
-          ./images/system-tests/ran-du/Dockerfile
-        archs: amd64, arm64
-
-    - name: Push To quay.io eco-gotests-ran-du image
-      id: push-to-quay-eco-gotests-ran-du
-      uses: redhat-actions/push-to-registry@v2
+        context: .
+        file: ./Dockerfile
+        push: true
+        platforms: linux/amd64,linux/arm64
+        tags: quay.io/ocp-edge-qe/eco-gotests:${{ steps.set_image_tag.outputs.IMAGE_TAG }}
+
+    - name: Build and push eco-gotests-ran-du
+      uses: docker/build-push-action@v6
       with:
-        image: ${{ steps.build-image-system.outputs.image }}
-        tags: ${{ steps.build-image-system.outputs.tags }}
-        registry: quay.io/ocp-edge-qe
-        username: ${{ secrets.OCP_EDGE_QE_QUAY_USER }}
-        password: ${{ secrets.OCP_EDGE_QE_QUAY }}
-
-    - name: Print image url eco-gotests-ran-du
-      run: echo "Image pushed to ${{ steps.push-to-quay-eco-gotests-ran-du.outputs.registry-paths }}"
+        context: .
+        file: ./images/system-tests/ran-du/Dockerfile
+        push: true
+        platforms: linux/amd64,linux/arm64
+        tags: quay.io/ocp-edge-qe/eco-gotests-ran-du:${{ steps.set_image_tag.outputs.IMAGE_TAG }}
diff --git a/.github/workflows/docker-image-manual.yml b/.github/workflows/docker-image-manual.yml
@@ -16,28 +16,24 @@ jobs:
     steps:
     - uses: actions/checkout@v6
 
+    - name: Login to Quay.io
+      uses: docker/login-action@v3
+      with:
+        registry: quay.io
+        username: ${{ secrets.OCP_EDGE_QE_QUAY_USER }}
+        password: ${{ secrets.OCP_EDGE_QE_QUAY }}
+
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v3
 
-    - name: Build docker image
-      id: build-image
-      uses: redhat-actions/buildah-build@v2
-      with:
-        image: eco-gotests
-        tags: ${{ github.event.inputs.tag }}-unstable
-        containerfiles: |
-          ./Dockerfile
-        archs: amd64, arm64
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
 
-    - name: Push To quay.io
-      id: push-to-quay
-      uses: redhat-actions/push-to-registry@v2
+    - name: Build and push
+      uses: docker/build-push-action@v6
       with:
-        image: ${{ steps.build-image.outputs.image }}
-        tags: ${{ steps.build-image.outputs.tags }}
-        registry: quay.io/ocp-edge-qe
-        username: ${{ secrets.OCP_EDGE_QE_QUAY_USER }}
-        password: ${{ secrets.OCP_EDGE_QE_QUAY }}
-
-    - name: Print image url
-      run: echo "Image pushed to ${{ steps.push-to-quay.outputs.registry-paths }}"
+        context: .
+        file: ./Dockerfile
+        push: true
+        platforms: linux/amd64,linux/arm64
+        tags: quay.io/ocp-edge-qe/eco-gotests:${{ github.event.inputs.tag }}-unstable
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,20 @@
+FROM --platform=$BUILDPLATFORM registry.access.redhat.com/ubi9/ubi:latest AS fetcher
+
+ARG GO_VER=go1.25.4
+RUN dnf install -y tar
+
+ARG TARGETARCH
+RUN arch=$(echo ${TARGETARCH} | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) && \
+    curl -Ls https://go.dev/dl/${GO_VER}.linux-${arch}.tar.gz | tar -C /usr/local -xzf -
+
 FROM registry.access.redhat.com/ubi9/ubi:latest
 
-ARG GO_VER=go1.25.0
+# We had issues with extracting the Go tarball using emulation, so this way we
+# extract it natively and then copy to the final image with the target
+# architecture.
+COPY --from=fetcher /usr/local/go /usr/local/go
+
+ARG GO_VER=go1.25.4
 ARG GINKGO_VER=ginkgo@v2.23.4
 ARG CONTAINERUSER=testuser
 
@@ -12,8 +26,6 @@ LABEL container.user=${CONTAINERUSER}
 ENV PATH "$PATH:/usr/local/go/bin:/root/go/bin"
 RUN dnf install -y tar gcc make && \
     dnf clean metadata packages && \
-    arch=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) && \
-    curl -Ls https://go.dev/dl/${GO_VER}.linux-${arch}.tar.gz |tar -C /usr/local -xzf -  && \
     useradd -U -u 1000 -m -d /home/${CONTAINERUSER} -s /usr/bin/bash ${CONTAINERUSER}
 
 USER ${CONTAINERUSER}
