Run image build, push only on merge

Signed-off-by: Carlos Eduardo Arango Gutierrez <eduardoa@nvidia.com>

.github/workflows/images.yaml

@@ -30,10 +30,6 @@ on:
 
 jobs:
   build-image:
-    # We trigger image builds on push events (MERGED pull requests) or on non-closed PRs that are not created against a fork.
-    if: |
-      (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) ||
-      (github.event_name == 'push')
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -61,9 +57,10 @@ jobs:
           echo "PUSH_ON_BUILD=${GENERATE_ARTIFACTS}" >> $GITHUB_ENV
           echo "BUILD_MULTI_ARCH_IMAGES=${GENERATE_ARTIFACTS}" >> $GITHUB_ENV
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
         with:

Makefile

@@ -77,4 +77,4 @@ PHONY: .shell
 		-v $(PWD):/work \
 		-w /work \
 		--user $$(id -u):$$(id -g) \
-		$(BUILDIMAGE)
+		$(BUILDIMAGE)

deployments/container/Dockerfile.ubi8

@@ -14,7 +14,7 @@
 
 ARG CUDA_VERSION
 ARG BASE_DIST
-ARG GOLANG_VERSION=1.20.5
+ARG GOLANG_VERSION=x.x.x
 
 FROM golang:${GOLANG_VERSION} AS build
 

deployments/container/Makefile

@@ -81,6 +81,7 @@ $(BUILD_TARGETS): build-%:
 			$(DOCKER_BUILD_PLATFORM_OPTIONS) \
 			--tag $(IMAGE) \
 			--build-arg BASE_DIST="$(DIST)" \
+			--build-arg GOLANG_VERSION="$(GOLANG_VERSION)" \
 			--build-arg CUDA_VERSION="$(CUDA_VERSION)" \
 			--build-arg VERSION="$(VERSION)" \
 			--build-arg CVE_UPDATES="$(CVE_UPDATES)" \

versions.mk

@@ -18,7 +18,7 @@ MODULE := github.com/NVIDIA/k8s-driver-manager
 vVERSION := v$(VERSION:v%=%)
 
 CUDA_VERSION := 12.3.0
-GOLANG_VERSION ?= 1.20.5
+GOLANG_VERSION ?= 1.20.4
 
 BUILDIMAGE_TAG ?= devel-go$(GOLANG_VERSION)
-BUILDIMAGE ?=  ghcr.io/nvidia/k8s-test-infra:$(BUILDIMAGE_TAG)
+BUILDIMAGE ?=  ghcr.io/nvidia/k8s-test-infra:$(BUILDIMAGE_TAG)