Merge pull request #32 from galal-hussein/fixing_tag

Fix passing the tag to build-args

Author: galal-hussein

.github/workflows/build.yml

@@ -27,6 +27,8 @@ jobs:
         push: false
         tags: rancher/hardened-crictl:${{ env.TAG }}-amd64
         file: Dockerfile
+        build-args: |
+          TAG=${{ env.TAG }}
 
     - name: Run Trivy vulnerability scanner
       uses: aquasecurity/trivy-action@0.21.0
@@ -68,3 +70,5 @@ jobs:
         file: Dockerfile
         outputs: type=docker
         platforms: linux/arm64
+        build-args: |
+          TAG=${{ env.TAG }}

.github/workflows/image-push.yml

@@ -3,7 +3,10 @@ on:
     types: [published]
 
 permissions:
-  contents: read  
+  contents: read
+
+env:
+  GITHUB_ACTION_TAG: ${{ github.ref_name }}
 
 jobs:
   push-multiarch:
@@ -15,6 +18,11 @@ jobs:
     - name: Check out code
       uses: actions/checkout@v4
 
+    - name: Set the TAG value
+      id: get-TAG
+      run: |
+        echo "$(make -s log | grep TAG)" >> "$GITHUB_ENV"
+
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v3
 
@@ -42,3 +50,5 @@ jobs:
         tags: rancher/hardened-crictl:${{ github.event.release.tag_name }}
         file: Dockerfile
         platforms: linux/amd64, linux/arm64
+        build-args: |
+          TAG=${{ env.TAG }}

Makefile

@@ -14,7 +14,11 @@ BUILD_META=-build$(shell TZ=UTC date +%Y%m%d)
 ORG ?= rancher
 PKG ?= github.com/kubernetes-sigs/cri-tools
 SRC ?= github.com/kubernetes-sigs/cri-tools
-TAG ?= v1.26.1$(BUILD_META)
+TAG ?= ${GITHUB_ACTION_TAG}
+
+ifeq ($(TAG),)
+TAG := v1.26.1$(BUILD_META)
+endif
 
 ifeq (,$(filter %$(BUILD_META),$(TAG)))
 $(error TAG needs to end with build metadata: $(BUILD_META))
@@ -44,12 +48,13 @@ image-push:
 image-scan:
 	trivy --severity $(SEVERITIES) --no-progress --ignore-unfixed $(ORG)/hardened-crictl:$(TAG)
 
-PHONY: log
+.PHONY: log
 log:
 	@echo "ARCH=$(ARCH)"
-	@echo "TAG=$(TAG)"
+	@echo "TAG=$(TAG:$(BUILD_META)=)"
 	@echo "ORG=$(ORG)"
 	@echo "PKG=$(PKG)"
 	@echo "SRC=$(SRC)"
 	@echo "BUILD_META=$(BUILD_META)"
 	@echo "UNAME_M=$(UNAME_M)"
+	@echo "GOLANG_VERSION=$(GOLANG_VERSION)"