From 704a54bdd1c884a56a67cc06767d5881ca71b435 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 13 Feb 2023 18:45:01 +0100 Subject: [PATCH] chore: fix docker.sh script (backport #6005) (#6009) chore: fix docker.sh script (#6005) Signed-off-by: Jakub Dyszkiewicz Co-authored-by: Jakub Dyszkiewicz --- tools/releases/docker.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/releases/docker.sh b/tools/releases/docker.sh index 0ab621b9919b..833b550d9ce6 100755 --- a/tools/releases/docker.sh +++ b/tools/releases/docker.sh @@ -8,7 +8,9 @@ source "${SCRIPT_DIR}/../common.sh" KUMA_DOCKER_REPO="${KUMA_DOCKER_REPO:-docker.io}" KUMA_DOCKER_REPO_ORG="${KUMA_DOCKER_REPO_ORG:-${KUMA_DOCKER_REPO}/kumahq}" KUMA_COMPONENTS="${KUMA_COMPONENTS:-kuma-cp kuma-dp kumactl kuma-init kuma-prometheus-sd}" -ENVOY_VERSION="${ENVOY_VERSION:-1.21.3}" +BUILD_INFO=$("${SCRIPT_DIR}/../releases/version.sh") +ENVOY_VERSION=$(echo "$BUILD_INFO" | cut -d " " -f 5) +KUMA_VERSION=$(echo "$BUILD_INFO" | cut -d " " -f 1) function build() { for component in ${KUMA_COMPONENTS}; do @@ -21,6 +23,8 @@ function build() { } function docker_login() { + [ -z "$DOCKER_USERNAME" ] && msg_err "\$DOCKER_USERNAME required" + [ -z "$DOCKER_API_KEY" ] && msg_err "\$DOCKER_API_KEY required" docker login -u "$DOCKER_USERNAME" -p "$DOCKER_API_KEY" "$KUMA_DOCKER_REPO" } @@ -46,8 +50,6 @@ function usage() { } function main() { - KUMA_VERSION=$("${SCRIPT_DIR}/version.sh") - while [[ $# -gt 0 ]]; do flag=$1 case $flag in @@ -68,9 +70,6 @@ function main() { shift done - [ -z "$DOCKER_USERNAME" ] && msg_err "\$DOCKER_USERNAME required" - [ -z "$DOCKER_API_KEY" ] && msg_err "\$DOCKER_API_KEY required" - case $op in build) build