tune ko

angeloxx · Aug 16, 2024 · 414d94c · 414d94c
1 parent 8668913
commit 414d94c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -22,12 +22,14 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-
       - name: Build Image
         env:
-          AUTH_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
-          KO_DOCKER_REPO: angeloxx/cilium-egress-observer
-          VERSION: latest
+          #AUTH_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+          # KO_DOCKER_REPO: angeloxx/cilium-egress-observer
+          #VERSION: latest
+          IMAGE_REGISTRY_NAMESPACE: angeloxx
+          IMAGE_REGISTRY: hub.docker.io
+          IMAGE_TAG_FORCED: latest
         run: |
           # echo "${AUTH_TOKEN}" | ko login hub.docker.io --username angeloxx --password-stdin
           make build-image

diff --git a/Makefile b/Makefile
@@ -15,6 +15,11 @@ ifneq ($(shell git status --porcelain),)
 	VERSION := $(VERSION)-dirty
 endif
 
+IMAGE_TAG := ${VERSION}
+ifeq ($(IMAGE_TAG_FORCED),)
+	IMAGE_TAG := ${IMAGE_TAG_FORCED}
+endif
+
 IMAGE_REGISTRY_NAMESPACE ?= angeloxx
 IMAGE_TAG_BASE ?= $(IMAGE_REGISTRY_NAMESPACE)/cilium-egress-observer
 IMAGE_REGISTRY ?= docker.io
@@ -128,8 +133,7 @@ PLATFORMS ?= linux/arm64,linux/amd64
 .PHONY: build-image
 build-image: ko # vulncheck
 	KO_DOCKER_REPO=${IMAGE} \
-    VERSION=${VERSION} \
-    ko build --tags ${VERSION} --bare --sbom ${IMG_SBOM} \
+    ko build --tags ${IMAGE_TAG_FORCED} --bare --sbom ${IMG_SBOM} \
       --image-label org.opencontainers.image.source="https://github.com/angeloxx/cilium-egress-observer" \
       --image-label org.opencontainers.image.revision=$(shell git rev-parse HEAD) \
       --platform=${PLATFORMS}  --push=true .