From c2ff69021dd08aefa2bbfb4efd1dff93e944a94a Mon Sep 17 00:00:00 2001 From: El RIDO Date: Wed, 14 Jul 2021 20:24:07 +0200 Subject: [PATCH] take shellcheck to town --- buildx.sh | 78 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 41 insertions(+), 37 deletions(-) diff --git a/buildx.sh b/buildx.sh index 3a10302..68687da 100755 --- a/buildx.sh +++ b/buildx.sh @@ -5,67 +5,71 @@ set -euxo pipefail EVENT=$1 -VERSION=${GITHUB_REF##*/} - build_image() { - local push build_args - push=$1; shift 1; - build_args="$@" + local PUSH + PUSH=$1 + shift 1 - docker buildx build \ - --platform linux/amd64,linux/386,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le \ - --output type=image,push=$push \ - --pull \ - --no-cache \ - --progress plain \ - $build_args \ - . + docker buildx build \ + --platform linux/amd64,linux/386,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le \ + --output type=image,push="$PUSH" \ + --pull \ + --no-cache \ + --progress plain \ + $@ \ + . +} + +docker_login() { + printenv DOCKER_PASSWORD | docker login \ + --username "$DOCKER_USERNAME" \ + --password-stdin } image_build_arguments() { cat< Dockerfile.edge - image_build_arguments | while read image build_args ; do - build_image $push -f Dockerfile.edge --tag $image:edge "$build_args" + image_build_arguments | while read -r IMAGE BUILD_ARGS + do + build_image $PUSH --tag "$IMAGE:latest" --tag "$IMAGE:$TAG" $BUILD_ARGS + build_image $PUSH -f Dockerfile.edge --tag "$IMAGE:edge" $BUILD_ARGS done - rm -f Dockerfile.edge - - rm -f "$HOME/.docker/config.json" + rm -f Dockerfile.edge "$HOME/.docker/config.json" } -main +[ "$(basename "$0")" = 'buildx.sh' ] && main