From f2cf6f4ee17b923485959b41d6461bf869508907 Mon Sep 17 00:00:00 2001 From: Lucas Gravley <29484535+admiralAwkbar@users.noreply.github.com> Date: Thu, 9 Jan 2020 14:10:43 -0600 Subject: [PATCH 1/2] remove typo --- .automation/cleanup-docker.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.automation/cleanup-docker.sh b/.automation/cleanup-docker.sh index 063af71f..a5603788 100755 --- a/.automation/cleanup-docker.sh +++ b/.automation/cleanup-docker.sh @@ -112,12 +112,7 @@ ValidateInput() ################################### # Remove non alpha-numberic chars # ################################### - BRANCH_NAME=$(echo "$BRANCH_NAME" | tr -cd '[:alnum:]') - - ############################################ - # Set the IMAGE_VERSION to the BRANCH_NAME # - ############################################ - IMAGE_VERSION="$BRANCH_NAME" + IMAGE_VERSION=$(echo "$IMAGE_VERSION" | tr -cd '[:alnum:]') else ############################################# # Image is 'latest' and we will not destroy # From fd88aa2149cd05c98306e530d5d869579639c8e8 Mon Sep 17 00:00:00 2001 From: Lucas Gravley <29484535+admiralAwkbar@users.noreply.github.com> Date: Thu, 9 Jan 2020 14:10:58 -0600 Subject: [PATCH 2/2] cleaner --- .automation/cleanup-docker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.automation/cleanup-docker.sh b/.automation/cleanup-docker.sh index a5603788..56f8128b 100755 --- a/.automation/cleanup-docker.sh +++ b/.automation/cleanup-docker.sh @@ -120,7 +120,7 @@ ValidateInput() echo "Image Tag is set to:[latest]..." echo "We will never destroy latest..." echo "Bye!" - exit 0 + exit 1 fi } ################################################################################