From 2ed366226ea61832475a18a0dcf3e774a6d52bf3 Mon Sep 17 00:00:00 2001 From: Oli Evans Date: Thu, 12 Mar 2020 17:07:09 +0000 Subject: [PATCH] wip: use date instead of circleci build num License: MIT Signed-off-by: Oli Evans --- .circleci/config.yml | 2 +- bin/push-docker-tags.sh | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f3b6b9b74..038e316e5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -336,7 +336,7 @@ jobs: name: Publish Docker Image to Docker Hub command: | echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin - ./bin/push-docker-tags.sh "$CIRCLE_BUILD_NUM" "$CIRCLE_SHA1" "$CIRCLE_BRANCH" "$CIRCLE_TAG" dryrun + ./bin/push-docker-tags.sh (date -u +%F) "$CIRCLE_SHA1" "$CIRCLE_BRANCH" "$CIRCLE_TAG" dryrun workflows: version: 2 diff --git a/bin/push-docker-tags.sh b/bin/push-docker-tags.sh index 60fd03a04..162d879d7 100755 --- a/bin/push-docker-tags.sh +++ b/bin/push-docker-tags.sh @@ -16,16 +16,16 @@ # # Example: # # dry run. pass a 5th arg to have it print what it would do rather than do it. -# ./push-docker-tags.sh 1 testingsha mybranch v1.0 dryrun +# ./push-docker-tags.sh $(date -u +%F) testingsha master "" dryrun # # # push tag for the master branch -# ./push-docker-tags.sh 1 testingsha master +# ./push-docker-tags.sh $(date -u +%F) testingsha master # # # push tag for a release tag -# ./push-docker-tags.sh 1 testingsha release v0.5.0 +# ./push-docker-tags.sh $(date -u +%F) testingsha release v0.5.0 # # # Serving suggestion in circle ci - https://circleci.com/docs/2.0/env-vars/#built-in-environment-variables -# ./push-docker-tags.sh "$CIRCLE_BUILD_NUM" "$CIRCLE_SHA1" "$CIRCLE_BRANCH" "$CIRCLE_TAG" +# ./push-docker-tags.sh $(date -u +%F) "$CIRCLE_SHA1" "$CIRCLE_BRANCH" "$CIRCLE_TAG" # set -euo pipefail