Skip to content

Commit

Permalink
Use CSM common base image. (#253)
Browse files Browse the repository at this point in the history
  • Loading branch information
donatwork authored Jan 27, 2025
1 parent 4398886 commit cf557f8
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 30 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,7 @@ jobs:
run: go mod tidy
- name: Build podmon Docker Image
run: |
chmod +x ./scripts/buildubimicro.sh
make build-base-image
podman build -t docker.io/podmon -f ./Dockerfile --build-arg GOIMAGE=golang:latest --build-arg BASEIMAGE="localhost/resiliency-ubimicro"
podman build -t docker.io/podmon -f ./Dockerfile --build-arg GOIMAGE=golang:latest --build-arg BASEIMAGE="quay.io/dell/container-storage-modules/csm-base-image:nightly"
podman save docker.io/library/podmon -o /tmp/podmon.tar
docker load -i /tmp/podmon.tar
- name: Trivy image scanner
Expand Down
8 changes: 2 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ MINOR=12
PATCH=0
VERSION?="v$(MAJOR).$(MINOR).$(PATCH)"
REGISTRY?="${REGISTRY_HOST}:${REGISTRY_PORT}/podmon"
BASEIMAGE?="resiliency-ubimicro:latest"

all: clean podman push

Expand All @@ -31,12 +30,9 @@ clean:
build:
GOOS=linux CGO_ENABLED=0 go build -o podmon ./cmd/podmon/

build-base-image: download-csm-common
podman: download-csm-common
$(eval include csm-common.mk)
sh ./scripts/buildubimicro.sh $(DEFAULT_BASEIMAGE)

podman: build-base-image
podman build --no-cache -t "$(REGISTRY):$(VERSION)" --build-arg GOIMAGE=$(DEFAULT_GOIMAGE) --build-arg BASEIMAGE=$(BASEIMAGE) -f ./Dockerfile --label commit=$(shell git log --max-count 1 --format="%H") .
podman build --pull --no-cache -t "$(REGISTRY):$(VERSION)" --build-arg GOIMAGE=$(DEFAULT_GOIMAGE) --build-arg BASEIMAGE=$(CSM_BASEIMAGE) -f ./Dockerfile --label commit=$(shell git log --max-count 1 --format="%H") .

push:
podman push "$(REGISTRY):$(VERSION)"
Expand Down
21 changes: 0 additions & 21 deletions scripts/buildubimicro.sh

This file was deleted.

0 comments on commit cf557f8

Please sign in to comment.