updating make file and actions.yaml

dell · Jul 27, 2023 · f01ae87 · f01ae87
1 parent 25b10d2
commit f01ae87
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -92,7 +92,14 @@ jobs:
       - name: Mod tidy
         run: go mod tidy
       - name: Build podmon Docker Image
-        run: cd cmd/podmon ; chmod +x ../../scripts/buildubimicro.sh ; buildah unshare ../../scripts/buildubimicro.sh "registry.access.redhat.com/ubi8-micro:8.8-3"; make clean 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
+        run: |
+         cd cmd/podmon
+         chmod +x ../../scripts/buildubimicro.sh
+         buildah unshare ../../scripts/buildubimicro.sh "registry.access.redhat.com/ubi9-micro:9.2-9"
+         make clean 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
       - name: Image scanner
         uses: Azure/container-scan@v0
         with:

diff --git a/cmd/podmon/Makefile b/cmd/podmon/Makefile
@@ -16,8 +16,8 @@ MAJOR=0
 MINOR=0
 PATCH=54
 VERSION?="v$(MAJOR).$(MINOR).$(PATCH)"
-REGISTRY?="${REGISTRY_HOST}:${REGISTRY_PORT}/podmontest"
-BASEIMAGE?="localhost/resiliency-micro:latest"
+REGISTRY?="${REGISTRY_HOST}:${REGISTRY_PORT}/podmon"
+BASEIMAGE?="resiliency-micro:latest"
 
 clean:
 	go clean ./...
@@ -26,7 +26,7 @@ build:
 	CGO_ENABLED=0 GOOS=linux GOARCH=amd64  go build -a -ldflags '-w' ./...
 
 build-base-image:
-	sh ../../scripts/buildubimicro.sh "registry.access.redhat.com/ubi8-micro:8.8-3"
+	sh ../../scripts/buildubimicro.sh "registry.access.redhat.com/ubi9-micro:9.2-9"
 
 podman:
 	podman build --no-cache -t "$(REGISTRY):$(VERSION)" --build-arg BASEIMAGE=$(BASEIMAGE) --label commit=$(shell git log --max-count 1 --format="%H") .