diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index ac4edad0..477c3aa6 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -88,11 +88,18 @@ jobs: - name: Install Mockgen run: go get github.com/golang/mock/mockgen@v1.6.0 - name: Get dependencies - run: go mod download + run: go mod download ; sudo apt -y install dnf - name: Mod tidy run: go mod tidy - name: Build podmon Docker Image - run: cd cmd/podmon ; make clean build; docker build -t podmon . + 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/Makefile b/Makefile index a9d24186..36107837 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Dell Inc., or its subsidiaries. All Rights Reserved. +# Copyright (c) 2021-2023 Dell Inc., or its subsidiaries. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ # limitations under the License. # Includes the following generated file to get semantic version information all: - (cd cmd/podmon; make clean build docker push) + (cd cmd/podmon; make clean build-base-image build podman push) check: @scripts/check.sh ./internal/monitor ./internal/k8sapi ./internal/csiapi ./internal/criapi ./cmd/podmon diff --git a/README.md b/README.md index 50ce0c0e..d59c55a1 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@