Merge pull request #55 from dell/Update_ubi_dependencies

Update ubi dependencies

Makefile

@@ -71,7 +71,7 @@ clean:
 # Generates the docker container (but does not push)
 docker:
 	go generate .
-	make -f docker.mk DOCKER_FILE=docker-files/Dockerfile docker
+	make -f docker.mk DOCKER_FILE=docker-files/Dockerfile  build-base-image docker
 
 # Same as `docker` but without cached layers and will pull latest version of base image
 docker-no-cache:

docker.mk

@@ -22,14 +22,20 @@ docker: download-csm-common
 	$(eval include csm-common.mk)
 	echo "Building: $(REGISTRY)/$(IMAGENAME):v$(MAJOR).$(MINOR).$(PATCH) RELNOTE $(RELNOTE)"
 	echo "$(DOCKER_FILE)"
-	$(BUILDER) build -f $(DOCKER_FILE) -t "$(REGISTRY)/$(IMAGENAME):v$(MAJOR).$(MINOR).$(PATCH)$(RELNOTE)" --build-arg BASEIMAGE=$(DEFAULT_BASEIMAGE) --build-arg GOIMAGE=$(DEFAULT_GOIMAGE) .
+	$(BUILDER) build -f $(DOCKER_FILE) -t "$(REGISTRY)/$(IMAGENAME):v$(MAJOR).$(MINOR).$(PATCH)$(RELNOTE)" --build-arg BASEIMAGE=$(BASEIMAGE) --build-arg GOIMAGE=$(DEFAULT_GOIMAGE) .
 
 docker-no-cache: download-csm-common
 	$(eval include csm-common.mk)
 	echo "Building: $(REGISTRY)/$(IMAGENAME):$(MAJOR).$(MINOR).$(PATCH) RELNOTE $(RELNOTE)"
 	echo "$(DOCKER_FILE) --no-cache"
 	$(BUILDER) build --no-cache --pull -f $(DOCKER_FILE) -t "$(REGISTRY)/$(IMAGENAME):v$(MAJOR).$(MINOR).$(PATCH)$(RELNOTE)" --build-arg BASEIMAGE=$(DEFAULT_BASEIMAGE) --build-arg GOIMAGE=$(DEFAULT_GOIMAGE) .
 
+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=mdr-ubimicro:latest)
 
 push:   
 	echo "Pushing MAJOR $(MAJOR) MINOR $(MINOR) PATCH $(PATCH) RELNOTE $(RELNOTE)"

go.mod

@@ -1,6 +1,6 @@
 module github.com/dell/csi-metadata-retriever
 
-go 1.22
+go 1.22.0
 
 require (
 	github.com/dell/gocsi v1.10.1

scripts/build_ubi_micro.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 tar gzip -y
+dnf clean all --installroot $micromount
+buildah umount $microcontainer
+buildah commit $microcontainer mdr-ubimicro