Use common base image (#182)

dell · Nov 9, 2023 · 7ffc9c9 · 7ffc9c9
1 parent 6d2a8da
commit 7ffc9c9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -95,8 +95,7 @@ jobs:
         run: |
          cd cmd/podmon
          chmod +x ../../scripts/buildubimicro.sh
-         buildah unshare ../../scripts/buildubimicro.sh "registry.access.redhat.com/ubi9-micro:9.2"
-         make clean build
+         make clean build-base-image build
          podman build -t docker.io/podmon . --build-arg BASEIMAGE="localhost/resiliency-ubimicro"
          podman save docker.io/library/podmon -o /tmp/podmon.tar
          docker load -i /tmp/podmon.tar

diff --git a/cmd/podmon/Makefile b/cmd/podmon/Makefile
@@ -25,8 +25,9 @@ clean:
 build:
 	CGO_ENABLED=0 GOOS=linux GOARCH=amd64  go build -a -ldflags '-w' ./...
 
-build-base-image:
-	sh ../../scripts/buildubimicro.sh "registry.access.redhat.com/ubi9-micro:9.2"
+build-base-image: download-csm-common
+	$(eval include csm-common.mk)
+	sh ../../scripts/buildubimicro.sh $(DEFAULT_BASEIMAGE)
 
 podman:
 	podman build --no-cache -t "$(REGISTRY):$(VERSION)" --build-arg BASEIMAGE=$(BASEIMAGE) --label commit=$(shell git log --max-count 1 --format="%H") .
@@ -41,3 +42,5 @@ godog:
 	go clean -cache
 	go test -v -coverprofile=c.out -test.run TestMain ./...
 
+download-csm-common:
+	curl -O -L https://raw.githubusercontent.com/dell/csm/main/config/csm-common.mk