From 2a37e81631df999711658580cd112f4e78ccb1d7 Mon Sep 17 00:00:00 2001 From: wang yan Date: Fri, 22 Nov 2019 14:03:03 +0800 Subject: [PATCH] cherry-pick inject base image parameter when to build offline installer Signed-off-by: wang yan --- Makefile | 2 +- tests/integration.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e85593758..ef440036c 100644 --- a/Makefile +++ b/Makefile @@ -323,7 +323,7 @@ build: -e CLAIRVERSION=$(CLAIRVERSION) -e CLAIRADAPTERVERSION=$(CLAIRADAPTERVERSION) -e VERSIONTAG=$(VERSIONTAG) \ -e BUILDBIN=$(BUILDBIN) -e REDISVERSION=$(REDISVERSION) -e MIGRATORVERSION=$(MIGRATORVERSION) \ -e CHARTMUSEUMVERSION=$(CHARTMUSEUMVERSION) -e DOCKERIMAGENAME_CHART_SERVER=$(DOCKERIMAGENAME_CHART_SERVER) \ - -e NPM_REGISTRY=$(NPM_REGISTRY) -e BASEIMAGETAG=${BASEIMAGETAG} + -e NPM_REGISTRY=$(NPM_REGISTRY) -e BASEIMAGETAG=$(BASEIMAGETAG) build_base_docker: @for name in chartserver clair clair-adapter core db jobservice log nginx notary-server notary-signer portal prepare redis registry registryctl; do \ diff --git a/tests/integration.sh b/tests/integration.sh index 1a243c0f7..4b63128e5 100755 --- a/tests/integration.sh +++ b/tests/integration.sh @@ -99,7 +99,7 @@ if [[ $DRONE_BRANCH == "release-"* ]]; then else Harbor_Build_Base_Tag=dev fi -export Harbor_Build_Base_Tag=Harbor_Build_Base_Tag +export Harbor_Build_Base_Tag=$Harbor_Build_Base_Tag echo "--------------------------------------------------" echo "Harbor Package version: $Harbor_Package_Version"