Use common base image (#67)

dell · Nov 8, 2023 · 4c89bc3 · 4c89bc3
1 parent cf59dfd
commit 4c89bc3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,6 @@
-FROM  registry.access.redhat.com/ubi9/ubi-micro@sha256:630cf7bdef807f048cadfe7180d6c27eb3aaa99323ffc3628811da230ed3322a
+ARG BASEIMAGE
+
+FROM $BASEIMAGE as final
 LABEL vendor="Dell Inc." \
       name="csm-metrics-powerstore" \
       summary="Dell Container Storage Modules (CSM) for Observability - Metrics for PowerStore" \

diff --git a/Makefile b/Makefile
@@ -30,8 +30,9 @@ test:
 	go test -count=1 -cover -race -timeout 30s -short ./...
 
 .PHONY: docker
-docker:
-	SERVICE=cmd/metrics-powerstore docker build -t csm-metrics-powerstore -f Dockerfile cmd/metrics-powerstore/
+docker: download-csm-common
+	$(eval include csm-common.mk)
+	SERVICE=cmd/metrics-powerstore docker build -t csm-metrics-powerstore -f Dockerfile --build-arg BASEIMAGE=$(DEFAULT_BASEIMAGE) cmd/metrics-powerstore/
 
 .PHONY: push
 push:
@@ -44,3 +45,7 @@ tag:
 .PHONY: check
 check:
 	./scripts/check.sh ./cmd/... ./opentelemetry/... ./internal/...
+
+.PHONY: download-csm-common
+download-csm-common:
+	curl -O -L https://raw.githubusercontent.com/dell/csm/main/config/csm-common.mk