fix(build): use env IMAGE_ORG as docker user name

Signed-off-by: kmova <[email protected]>
openebs-archive · Jul 12, 2020 · 0b95201 · 0b95201
1 parent 8cbf8be
commit 0b95201
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/Makefile b/Makefile
@@ -86,9 +86,6 @@ upgrade:
 	@# A copy of the binary will also be placed under: ./bin/${PNAME}/${CTLNAME}
 	@PNAME=${UPGRADE} CTLNAME=${UPGRADE} CGO_ENABLED=0 sh -c "'$(PWD)/build/build.sh'"
 
-# docker hub username
-HUB_USER?=openebs
-
 ifeq (${IMAGE_TAG}, )
   IMAGE_TAG = ci
   export IMAGE_TAG
@@ -100,22 +97,22 @@ endif
 upgrade-image.amd64: upgrade
 	@echo "-----------------------------------------------"
 	@echo "--> ${UPGRADE} image                           "
-	@echo "${HUB_USER}/${UPGRADE_REPO_NAME}:${IMAGE_TAG}"
+	@echo "${IMAGE_ORG}/${UPGRADE_REPO_NAME}:${IMAGE_TAG}"
 	@echo "-----------------------------------------------"
 	@cp bin/${UPGRADE}/${UPGRADE} build/${UPGRADE}
 	@cd build/${UPGRADE} && \
-	 sudo docker build -t "${HUB_USER}/${UPGRADE_REPO_NAME_AMD64}:${IMAGE_TAG}" ${DBUILD_ARGS} .
+	 sudo docker build -t "${IMAGE_ORG}/${UPGRADE_REPO_NAME_AMD64}:${IMAGE_TAG}" ${DBUILD_ARGS} .
 	@rm build/${UPGRADE}/${UPGRADE}
 
 .PHONY: upgrade-image.arm64
 upgrade-image.arm64: upgrade
 	@echo "-----------------------------------------------"
 	@echo "--> ${UPGRADE} image                           "
-	@echo "${HUB_USER}/${UPGRADE_REPO_NAME_ARM64}:${IMAGE_TAG}"
+	@echo "${IMAGE_ORG}/${UPGRADE_REPO_NAME_ARM64}:${IMAGE_TAG}"
 	@echo "-----------------------------------------------"
 	@cp bin/${UPGRADE}/${UPGRADE} build/${UPGRADE}
 	@cd build/${UPGRADE} && \
-	 sudo docker build -t "${HUB_USER}/${UPGRADE_REPO_NAME_ARM64}:${IMAGE_TAG}" ${DBUILD_ARGS} .
+	 sudo docker build -t "${IMAGE_ORG}/${UPGRADE_REPO_NAME_ARM64}:${IMAGE_TAG}" ${DBUILD_ARGS} .
 	@rm build/${UPGRADE}/${UPGRADE}
 
 

diff --git a/build/migrate/Makefile.mk b/build/migrate/Makefile.mk
@@ -32,23 +32,23 @@ migrate:
 migrate-image.amd64: migrate
 	@echo "-----------------------------------------------"
 	@echo "--> ${MIGRATE} image                           "
-	@echo "${HUB_USER}/${MIGRATE_REPO_NAME_AMD64}:${IMAGE_TAG}"
+	@echo "${IMAGE_ORG}/${MIGRATE_REPO_NAME_AMD64}:${IMAGE_TAG}"
 	@echo "-----------------------------------------------"
 	@cp bin/${MIGRATE}/${MIGRATE} build/${MIGRATE}/
 	@cd build/${MIGRATE} && \
-	 sudo docker build -t "${HUB_USER}/${MIGRATE_REPO_NAME_AMD64}:${IMAGE_TAG}" ${DBUILD_ARGS} .
+	 sudo docker build -t "${IMAGE_ORG}/${MIGRATE_REPO_NAME_AMD64}:${IMAGE_TAG}" ${DBUILD_ARGS} .
 	@rm build/${MIGRATE}/${MIGRATE}
 
 # build migrate image
 .PHONY: migrate-image.arm64
 migrate-image.arm64: migrate
 	@echo "-----------------------------------------------"
 	@echo "--> ${MIGRATE} image                           "
-	@echo "${HUB_USER}/${MIGRATE_REPO_NAME_ARM64}:${IMAGE_TAG}"
+	@echo "${IMAGE_ORG}/${MIGRATE_REPO_NAME_ARM64}:${IMAGE_TAG}"
 	@echo "-----------------------------------------------"
 	@cp bin/${MIGRATE}/${MIGRATE} build/${MIGRATE}/
 	@cd build/${MIGRATE} && \
-	 sudo docker build -t "${HUB_USER}/${MIGRATE_REPO_NAME_ARM64}:${IMAGE_TAG}" ${DBUILD_ARGS} .
+	 sudo docker build -t "${IMAGE_ORG}/${MIGRATE_REPO_NAME_ARM64}:${IMAGE_TAG}" ${DBUILD_ARGS} .
 	@rm build/${MIGRATE}/${MIGRATE}
 
 # cleanup migrate build