Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: fix docker.sh script #6005

Merged
merged 1 commit into from
Feb 13, 2023
+5 −6
Merged

chore: fix docker.sh script #6005

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions tools/releases/docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-cni}"
ENVOY_VERSION=$("${SCRIPT_DIR}/../envoy/version.sh")
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)
BUILD_ARCH="${BUILD_ARCH:-amd64 arm64}"

function build() {
Expand All @@ -33,6 +35,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"
}

Expand Down Expand Up @@ -80,8 +84,6 @@ function usage() {
}

function main() {
KUMA_VERSION=$("${SCRIPT_DIR}/version.sh")

while [[ $# -gt 0 ]]; do
flag=$1
case $flag in
Expand All @@ -105,9 +107,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
Expand Down