Remove Dockerfile.podman

dell · Jan 31, 2025 · b9e5791 · b9e5791
1 parent f6dccb9
commit b9e5791
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 41 deletions.
diff --git a/Dockerfile.podman b/Dockerfile.podman
diff --git a/Makefile b/Makefile
@@ -7,7 +7,7 @@ ifneq (on,$(GO111MODULE))
 export GO111MODULE := on
 endif
 
-IMAGE_NAME=csi-unity-$(USER)
+IMAGE_NAME=csi-unity
 IMAGE_REGISTRY=dellemc
 IMAGE_TAG=$(shell date +%Y%m%d%H%M%S)
 
@@ -58,7 +58,6 @@ podman-push:
 #
 # Generates the docker container (but does not push)
 docker-build: download-csm-common go-build
-	$(eval include csm-common.mk)
 	cd core && go generate
 	go run core/semver/semver.go -f mk >semver.mk
 	make -f docker.mk docker-build

diff --git a/docker.mk b/docker.mk
@@ -18,14 +18,14 @@ DOCKER_IMAGE_TAG ?= ${VERSION}
 
 .PHONY: docker-build
 docker-build:
+	$(eval include csm-common.mk)
 	echo ${VERSION} ${GITLAB_CI} ${CI_COMMIT_TAG} ${CI_COMMIT_SHA}
 	rm -f core/core_generated.go
 	cd core && go generate
 	go run core/semver/semver.go -f mk >semver.mk
 	mkdir -p ${BIN_DIR}
 	GOOS=linux CGO_ENABLED=0 GOARCH=amd64 go build -ldflags '-extldflags "-static"' -o ${BIN_DIR}/${BIN_NAME}
-	docker build --pull -t ${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG} --build-arg GOPROXY=$(GOPROXY) --build-arg BASEIMAGE=$(CSM_BASEIMAGE) --build-arg GOIMAGE=$(DEFAULT_GOIMAGE) .
-	docker tag ${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG} ${DOCKER_REPO}/${DOCKER_NAMESPACE}/${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG}
+	docker build --pull -t ${DOCKER_REPO}/${DOCKER_NAMESPACE}/${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG} --build-arg GOPROXY=$(GOPROXY) --build-arg BASEIMAGE=$(CSM_BASEIMAGE) --build-arg GOIMAGE=$(DEFAULT_GOIMAGE) .
 
 .PHONY: docker-push
 docker-push: docker-build