From a39bc8963f5d9cfa033ee2849507573a1ec477a6 Mon Sep 17 00:00:00 2001 From: B1F030 Date: Wed, 15 May 2024 11:00:59 +0800 Subject: [PATCH] fix env DOCKER_BUILD_ARGS in hack/local-up-karmada.sh Signed-off-by: B1F030 --- hack/local-up-karmada.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hack/local-up-karmada.sh b/hack/local-up-karmada.sh index 503e551a5..b600d2627 100755 --- a/hack/local-up-karmada.sh +++ b/hack/local-up-karmada.sh @@ -61,6 +61,7 @@ MEMBER_CLUSTER_1_TMP_CONFIG="${KUBECONFIG_PATH}/${MEMBER_TMP_CONFIG_PREFIX}-${ME MEMBER_CLUSTER_2_TMP_CONFIG="${KUBECONFIG_PATH}/${MEMBER_TMP_CONFIG_PREFIX}-${MEMBER_CLUSTER_2_NAME}.config" PULL_MODE_CLUSTER_TMP_CONFIG="${KUBECONFIG_PATH}/${MEMBER_TMP_CONFIG_PREFIX}-${PULL_MODE_CLUSTER_NAME}.config" HOST_IPADDRESS=${1:-} +DOCKER_BUILD_ARGS=${DOCKER_BUILD_ARGS:-} CLUSTER_VERSION=${CLUSTER_VERSION:-"${DEFAULT_CLUSTER_VERSION}"} KIND_LOG_FILE=${KIND_LOG_FILE:-"/tmp/karmada"} @@ -132,7 +133,7 @@ util::create_cluster "${PULL_MODE_CLUSTER_NAME}" "${PULL_MODE_CLUSTER_TMP_CONFIG export VERSION="latest" export REGISTRY="docker.io/karmada" export KARMADA_IMAGE_LABEL_VALUE="May_be_pruned_in_local-up-karmada.sh" -export DOCKER_BUILD_ARGS="--label=image.karmada.io=${KARMADA_IMAGE_LABEL_VALUE}" +export DOCKER_BUILD_ARGS="${DOCKER_BUILD_ARGS} --label=image.karmada.io=${KARMADA_IMAGE_LABEL_VALUE}" make images GOOS="linux" --directory="${REPO_ROOT}" #clean up dangling images docker image prune --force --filter "label=image.karmada.io=${KARMADA_IMAGE_LABEL_VALUE}"