From 0e29029cb91386f5f13b3571b2f68ba38a3ce41d Mon Sep 17 00:00:00 2001
From: Simon Aronsson <simme@arcticbit.se>
Date: Sun, 14 Apr 2019 22:50:23 +0200
Subject: [PATCH] fix tag splitting

---
 .circleci/config.yml | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 155a3a4..3fe2d1a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -119,41 +119,37 @@ jobs:
           command: |
             mkdir -p ~/.docker/ && \
             echo '{"experimental": "enabled"}' > ~/.docker/config.json
-      - run:
-          name: Strip letters from tag
-          command: |
-            export NUM_TAG=$(echo $CIRCLE_TAG | sed 's/^v*//')
       - run:
           name: Create manifest for version
           command: |
             docker manifest create \
-              containrrr/watchtower:${NUM_TAG} \
-              containrrr/watchtower:amd64-${NUM_TAG} \
-              containrrr/watchtower:i386-${NUM_TAG} \
-              containrrr/watchtower:armhf-${NUM_TAG} \
-              containrrr/watchtower:arm64v8-${NUM_TAG}
+              containrrr/watchtower:$(echo $CIRCLE_TAG | sed 's/^v*//') \
+              containrrr/watchtower:amd64-$(echo $CIRCLE_TAG | sed 's/^v*//') \
+              containrrr/watchtower:i386-$(echo $CIRCLE_TAG | sed 's/^v*//') \
+              containrrr/watchtower:armhf-$(echo $CIRCLE_TAG | sed 's/^v*//') \
+              containrrr/watchtower:arm64v8-$(echo $CIRCLE_TAG | sed 's/^v*//')
       - run:
           name: Annotate i386 version
           command: |
             docker manifest annotate \
-              containrrr/watchtower:${NUM_TAG} \
-              containrrr/watchtower:i386-${NUM_TAG} \
+              containrrr/watchtower:$(echo $CIRCLE_TAG | sed 's/^v*//') \
+              containrrr/watchtower:i386-$(echo $CIRCLE_TAG | sed 's/^v*//') \
               --os linux \
               --arch 386
       - run:
           name: Annotate ARM version
           command: |
             docker manifest annotate \
-              containrrr/watchtower:${NUM_TAG} \
-              containrrr/watchtower:armhf-${NUM_TAG} \
+              containrrr/watchtower:$(echo $CIRCLE_TAG | sed 's/^v*//') \
+              containrrr/watchtower:armhf-$(echo $CIRCLE_TAG | sed 's/^v*//') \
               --os linux \
               --arch arm
       - run:
           name: Annotate ARM64 version
           command: |
             docker manifest annotate \
-              containrrr/watchtower:${NUM_TAG} \
-              containrrr/watchtower:arm64v8-${NUM_TAG} \
+              containrrr/watchtower:$(echo $CIRCLE_TAG | sed 's/^v*//') \
+              containrrr/watchtower:arm64v8-$(echo $CIRCLE_TAG | sed 's/^v*//') \
               --os linux \
               --arch arm64 \
               --variant v8
@@ -194,7 +190,7 @@ jobs:
       - run:
           name: Push manifests to Dockerhub
           command: |
-            docker manifest push containrrr/watchtower:${NUM_TAG} && \
+            docker manifest push containrrr/watchtower:$(echo $CIRCLE_TAG | sed 's/^v*//') && \
             docker manifest push containrrr/watchtower:latest
       - run:
           name: Sync Readme to Dockerhub