Merge branch 'main' into add-interface-filters

Author: boyamurthy

csireverseproxy/Dockerfile

@@ -46,7 +46,7 @@ RUN CGO_ENABLED=0 go build
 ############################
 # STEP 2 build a small image
 ############################
-FROM localhost/csipowermax-ubimicro:latest
+FROM csipowermax-ubimicro:latest
 LABEL vendor="Dell Inc." \
       name="csipowermax-reverseproxy" \
       summary="CSI PowerMax Reverse Proxy" \

csireverseproxy/Makefile

@@ -10,7 +10,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-REGISTRY?="localhost:5000/csipowermax-reverseproxy"
+REG?="localhost:5000/csipowermax-reverseproxy"
 VERSION="latest"
 
 coverpackages= revproxy/v2,revproxy/v2/pkg/config,revproxy/v2/pkg/standaloneproxy
@@ -30,12 +30,22 @@ check:
 build:	check
 	CGO_ENABLED=0 GOOS=linux GO111MODULE=on go build
 
-docker-build: build
-	docker build -t "$(REGISTRY):$(VERSION)" .
+build-base-image: download-csm-common
+	$(eval include csm-common.mk)
+	@echo "Building base image from $(DEFAULT_BASEIMAGE) and loading dependencies..."
+	./buildubimicro.sh $(DEFAULT_BASEIMAGE)
+	@echo "Base image build: SUCCESS"
+	$(eval BASEIMAGE=csipowermax-ubimicro:latest)
+
+docker-build: build build-base-image
+	docker build -t "$(REG):$(VERSION)" --build-arg GOIMAGE="golang:1.22" .
 
 docker-push: docker-build
-	docker push "$(REGISTRY):$(VERSION)"
+	docker push "$(REG):$(VERSION)"
 
 unit-test:
 	go test -v -coverprofile c.out -coverpkg $(coverpackages) ./...
 
+download-csm-common:
+	curl -O -L https://raw.githubusercontent.com/dell/csm/main/config/csm-common.mk
+

csireverseproxy/buildubimicro.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+microcontainer=$(buildah from $1)
+micromount=$(buildah mount $microcontainer)
+dnf install --installroot $micromount --releasever=8 --nodocs --setopt install_weak_deps=false --setopt=reposdir=/etc/yum.repos.d/ rpm -y
+dnf clean all --installroot $micromount
+buildah umount $microcontainer
+buildah commit $microcontainer csipowermax-ubimicro