From 3ab5e6ac386d20ab60e908be8ed61e2fb60c3510 Mon Sep 17 00:00:00 2001
From: Steven Sheehy <ssheehy@firescope.com>
Date: Mon, 17 Jun 2019 11:45:56 -0500
Subject: [PATCH] Fix release workflow

Signed-off-by: Steven Sheehy <ssheehy@firescope.com>
---
 .circleci/config.yml | 38 ++++++++++++++++++--------------------
 Makefile             | 13 +++++++------
 2 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 90e9c9a89d5e1..74fcae525f014 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -26,21 +26,28 @@ workflows:
         filters:
           branches:
             only: master
-    - publish-helm:
+    - deploy:
         requires:
-        - test
-        - test-helm
-        - build
-        - lint
+        - publish
         filters:
           branches:
             only: master
-    - deploy:
+  release:
+    jobs:
+    - release:
+        filters:
+          branches:
+            ignore: /.*/
+          tags:
+            only: /.+/
+    - publish-helm:
         requires:
-        - publish
+        - release
         filters:
           branches:
-            only: master
+            ignore: /.*/
+          tags:
+            only: /.+/
 
 # https://circleci.com/blog/circleci-hacks-reuse-yaml-in-your-circleci-config-with-yaml/
 defaults: &defaults
@@ -156,7 +163,7 @@ jobs:
           key: v1-loki-{{ .Branch }}-{{ .Revision }}
       - restore_cache:
           key: v1-loki-plugin-{{ .Branch }}-{{ .Revision }}
-          
+
       - run:
           name: Load Images
           command: |
@@ -168,7 +175,7 @@ jobs:
           command: |
             docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" &&
             make push-latest
-      
+
       - run:
           name: Push Docker Plugin
           command: |
@@ -234,18 +241,9 @@ jobs:
     steps:
       - checkout
       - setup_remote_docker
-      - restore_cache:
-          key: v1-loki-{{ .Branch }}-{{ .Revision }}
-      - run:
-          name: Load Images
-          command: |
-            touch loki-build-image/.uptodate &&
-            make BUILD_IN_CONTAINER=false load-images
-      - run:
-          name: "Print Tag"
-          command: echo ${CIRCLE_TAG}
       - run:
           name: "Release"
           command: |
             docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" &&
             make VERSION=${CIRCLE_TAG} release-perform
+
diff --git a/Makefile b/Makefile
index ff74cc07b6a22..11aecb559a85f 100644
--- a/Makefile
+++ b/Makefile
@@ -231,7 +231,8 @@ release-perform:
 	@set -e; \
 	for image_name in $(IMAGE_NAMES); do \
 		if ! echo $$image_name | grep build; then \
-			docker tag $$image_name:$(IMAGE_TAG) $$image_name:$(VERSION); \
+			docker pull $$image_name:master; \
+			docker tag $$image_name:master $$image_name:$(VERSION); \
 			docker push $$image_name:$(VERSION); \
 		fi \
 	done
@@ -296,8 +297,8 @@ PLUGIN_FOLDER = ./cmd/docker-driver
 PLUGIN_TAG ?= $(IMAGE_TAG)
 
 build-plugin: $(PLUGIN_FOLDER)/docker-driver
-	-docker plugin disable grafana/loki-docker-driver:$(IMAGE_TAG)
-	-docker plugin rm grafana/loki-docker-driver:$(IMAGE_TAG)
+	-docker plugin disable ${IMAGE_PREFIX}loki-docker-driver:$(IMAGE_TAG)
+	-docker plugin rm ${IMAGE_PREFIX}loki-docker-driver:$(IMAGE_TAG)
 	-rm -rf $(PLUGIN_FOLDER)/rootfs
 	mkdir $(PLUGIN_FOLDER)/rootfs
 	docker build -t rootfsimage $(PLUGIN_FOLDER)
@@ -305,10 +306,10 @@ build-plugin: $(PLUGIN_FOLDER)/docker-driver
 	(docker export $$ID | tar -x -C $(PLUGIN_FOLDER)/rootfs) && \
 	docker rm -vf $$ID
 	docker rmi rootfsimage -f
-	docker plugin create grafana/loki-docker-driver:$(PLUGIN_TAG) $(PLUGIN_FOLDER)
+	docker plugin create ${IMAGE_PREFIX}loki-docker-driver:$(PLUGIN_TAG) $(PLUGIN_FOLDER)
 
 push-plugin: build-plugin
-	docker plugin push grafana/loki-docker-driver:$(PLUGIN_TAG)
+	docker plugin push ${IMAGE_PREFIX}loki-docker-driver:$(PLUGIN_TAG)
 
 enable-plugin:
-	docker plugin enable grafana/loki-docker-driver:$(PLUGIN_TAG)
+	docker plugin enable ${IMAGE_PREFIX}loki-docker-driver:$(PLUGIN_TAG)