From aa06f5779dbefb2e49c3da8fea7da6da86115e0e Mon Sep 17 00:00:00 2001 From: Micah <54921163+micahvdk@users.noreply.github.com> Date: Fri, 6 May 2022 00:37:27 +1000 Subject: [PATCH] fix: multiple tags in build command (#121) --- .circleci/test-deploy.yml | 14 +++++++++++++- src/scripts/build.sh | 9 +++++++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/.circleci/test-deploy.yml b/.circleci/test-deploy.yml index f51bff0..2c1c8a1 100644 --- a/.circleci/test-deploy.yml +++ b/.circleci/test-deploy.yml @@ -362,6 +362,18 @@ workflows: docker-password: DOCKER_PASS update-description: true filters: *filters + - docker/publish: + name: publish-docker-multiple-tags + executor: docker-latest + context: CPE-orb-docker-testing + use-remote-docker: true + dockerfile: test.Dockerfile + image: cpeorbtesting/docker-orb-test + tag: $CIRCLE_SHA1,$CIRCLE_BUILD_NUM + docker-username: DOCKER_USER + docker-password: DOCKER_PASS + use-docker-credentials-store: true + filters: *filters # end docker/publish # begin test-install-docker-tools @@ -429,4 +441,4 @@ executors: image: ubuntu-2004:202010-01 machine-latest: machine: - image: ubuntu-2004:current \ No newline at end of file + image: ubuntu-2004:current diff --git a/src/scripts/build.sh b/src/scripts/build.sh index bd76f62..e9c1ac8 100644 --- a/src/scripts/build.sh +++ b/src/scripts/build.sh @@ -66,6 +66,11 @@ fi # The context must be the last argument. build_args+=("$PARAM_DOCKER_CONTEXT") +old_ifs="$IFS" +IFS=' ' + set -x -docker build "${build_args[@]}" -set +x \ No newline at end of file +docker build ${build_args[*]} +set +x + +IFS="$old_ifs"