Merge branch 'main' into usr/meggm/one-click

.github/workflows/release.yaml

@@ -1,7 +1,7 @@
 name: Release CSI-Powerflex
 # Invocable as a reusable workflow
 # Can be manually triggered
-on: # yamllint disable-line rule:truthy
+on:  # yamllint disable-line rule:truthy
   workflow_call:
   workflow_dispatch:
     inputs:

Makefile

@@ -38,11 +38,11 @@ build: dependencies
 
 # Generates the docker container (but does not push)
 docker: dependencies
-	make -f docker.mk build-base-image docker
+	make -f docker.mk docker
 
 # Generates the docker container with no cache (but does not push)
 docker-no-cache: dependencies
-	make -f docker.mk build-base-image docker-no-cache
+	make -f docker.mk docker-no-cache
 
 # Pushes container to the repository
 push: docker

docker.mk

@@ -15,25 +15,20 @@ IMAGETAG="v$(MAJOR).$(MINOR).$(PATCH)$(RELNOTE)"
 endif
 
 
-docker:
+docker: download-csm-common
+	$(eval include csm-common.mk)
 	@echo "Base Images is set to: $(BASEIMAGE)"
 	@echo "Building: $(REGISTRY)/$(IMAGENAME):$(IMAGETAG)"
-	$(BUILDER) build $(NOCACHE) -t "$(REGISTRY)/$(IMAGENAME):$(IMAGETAG)" --target $(BUILDSTAGE) --build-arg GOPROXY --build-arg BASEIMAGE=$(BASEIMAGE) --build-arg GOIMAGE=$(DEFAULT_GOIMAGE)  .
+	$(BUILDER) build --pull $(NOCACHE) -t "$(REGISTRY)/$(IMAGENAME):$(IMAGETAG)" --target $(BUILDSTAGE) --build-arg GOPROXY --build-arg BASEIMAGE=$(CSM_BASEIMAGE) --build-arg GOIMAGE=$(DEFAULT_GOIMAGE)  .
 
-docker-no-cache:
+docker-no-cache: download-csm-common
 	@echo "Building with --no-cache ..."
 	@make docker NOCACHE=--no-cache
 
 push:
 	@echo "Pushing: $(REGISTRY)/$(IMAGENAME):$(IMAGETAG)"
 	$(BUILDER) push "$(REGISTRY)/$(IMAGENAME):$(IMAGETAG)"
 
-build-base-image: download-csm-common
-	$(eval include csm-common.mk)
-	@echo "Building base image from $(DEFAULT_BASEIMAGE) and loading dependencies..."
-	./scripts/build_ubi_micro.sh $(DEFAULT_BASEIMAGE)
-	@echo "Base image build: SUCCESS"
-	$(eval BASEIMAGE=localhost/csipowerflex-ubimicro:latest)
 
 download-csm-common:
 	curl -O -L https://raw.githubusercontent.com/dell/csm/main/config/csm-common.mk