ci: replace individual github workflows with matrix-build for dockerfiles

Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>

Author: kpango

.github/actions/docker-build/action.yml

@@ -24,6 +24,10 @@ inputs:
   suffix:
     description: "The suffix for the docker tag (e.g., amd64)"
     required: false
+  ghcr_user:
+    description: "GHCR username"
+    required: false
+    default: ${{ github.repository_owner }}
 
 runs:
   using: "composite"
@@ -41,14 +45,35 @@ runs:
         username: ${{ inputs.docker_user }}
         password: ${{ inputs.docker_pass }}
 
+    - name: Login to GitHub Container Registry
+      if: inputs.docker_push == 'true'
+      uses: docker/login-action@v3
+      with:
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ inputs.github_token }}
+
     - name: Run Makefile Target
       shell: bash
       env:
         TARGET: ${{ inputs.target }}
         USER_DEFAULT: ${{ inputs.docker_user }}
+        GHCR_USER: ${{ inputs.ghcr_user }}
         DOCKER_PUSH: ${{ inputs.docker_push }}
         GITHUB_ACCESS_TOKEN: ${{ inputs.github_token }}
         DOCKER_BUILDER_PLATFORM: ${{ inputs.platform }}
         DOCKER_ARCH_SUFFIX: ${{ inputs.suffix }}
+        EVENT_NAME: ${{ github.event_name }}
+        EVENT_PATH: ${{ github.event_path }}
+        GITHUB_REF_VAR: ${{ github.ref }}
       run: |
-        make "$TARGET" DOCKER_PUSH="$DOCKER_PUSH" USER="$USER_DEFAULT" GITHUB_ACCESS_TOKEN="$GITHUB_ACCESS_TOKEN" DOCKER_BUILDER_PLATFORM="$DOCKER_BUILDER_PLATFORM" DOCKER_ARCH_SUFFIX="$DOCKER_ARCH_SUFFIX"
+        VERSION="nightly"
+
+        if [ "$EVENT_NAME" == "pull_request" ]; then
+          PR_NUM=$(jq -r ".number" "$EVENT_PATH")
+          VERSION="pr-$PR_NUM"
+        elif [[ "$GITHUB_REF_VAR" == refs/tags/* ]]; then
+          VERSION="${GITHUB_REF_VAR#refs/tags/}"
+        fi
+
+        make "$TARGET" DOCKER_PUSH="$DOCKER_PUSH" USER="$USER_DEFAULT" GHCR_USER="$GHCR_USER" VERSION="$VERSION" GITHUB_ACCESS_TOKEN="$GITHUB_ACCESS_TOKEN" DOCKER_BUILDER_PLATFORM="$DOCKER_BUILDER_PLATFORM" DOCKER_ARCH_SUFFIX="$DOCKER_ARCH_SUFFIX"

.github/workflows/docker-matrix.yml

@@ -137,6 +137,7 @@ jobs:
   merge_dev:
     needs: build_dev
     if: github.event_name != 'pull_request'
+    if: github.event_name != 'pull_request'
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4

Makefile

@@ -13,6 +13,7 @@ EMAIL = kpango@vdaas.org
 
 DOCKER_EXTRA_OPTS ?=
 DOCKER_ARCH_SUFFIX ?=
+GHCR_USER ?= $(USER)
 DOCKER_PUSH ?= true
 DOCKER_BUILDER_NAME = "kpango-builder"
 DOCKER_BUILDER_DRIVER = "docker-container"
@@ -22,9 +23,6 @@ DOCKER_BUILD_CACHE_DIR:= $(HOME)/.docker/buildcache
 DOCKER_MEMORY_LIMIT = 32G
 
 VERSION ?= latest
-ifneq (,$(findstring refs/tags/,$(GITHUB_REF)))
-	VERSION := $(subst refs/tags/,,$(GITHUB_REF))
-endif
 
 ifneq ($(DOCKER_ARCH_SUFFIX),)
 	DOCKER_TAG_VERSION = $(VERSION)-$(DOCKER_ARCH_SUFFIX)
@@ -441,6 +439,7 @@ docker_build:
 		--provenance=mode=max \
 		--secret id=gat,src="$(TMP_DIR)/gat" \
 		-t "$(USER)/$(NAME):$(DOCKER_TAG_VERSION)" \
+		-t "ghcr.io/$(GHCR_USER)/$(NAME):$(DOCKER_TAG_VERSION)" \
 		-f $(DOCKERFILE) .
 		# --cache-to type=image,ref=$(DOCKER_CACHE_REPO),mode=max,inline=true \
 	docker buildx rm --force "$(DOCKER_BUILDER_NAME)"
@@ -559,6 +558,9 @@ docker_merge:
 	docker buildx imagetools create -t "$(USER)/$(NAME):$(VERSION)" \
 		"$(USER)/$(NAME):$(VERSION)-amd64" \
 		"$(USER)/$(NAME):$(VERSION)-arm64"
+		docker buildx imagetools create -t "ghcr.io/$(GHCR_USER)/$(NAME):$(VERSION)" \
+		"ghcr.io/$(GHCR_USER)/$(NAME):$(VERSION)-amd64" \
+		"ghcr.io/$(GHCR_USER)/$(NAME):$(VERSION)-arm64"
 
 do_merge:
 	@make NAME="$(NAME)" docker_merge