From 6a639efdba92a348681d374c2028e64dc22524f2 Mon Sep 17 00:00:00 2001
From: Cody Soyland <cody@soyland.org>
Date: Thu, 2 Apr 2020 12:12:17 -0500
Subject: [PATCH] Modify Docker Hub deployment filter rules.

The documentation is unclear/incorrect, and these filters aren't
behaving correctly. This is an attempt at fixing that. More info at:
https://discuss.circleci.com/t/job-runs-even-when-tags-ignore-filter-is-triggered-when-combined-with-branches-only/20664/11
---
 .circleci/config.yml | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index dc8aa1251..dd72390e8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -211,20 +211,6 @@ workflows:
             - linter
             - check-license-headers
             - test-golang-1.14
-      - dockerhub-upload:
-          name: dockerhub-upload-stable
-          tag_branch: true
-          tag_tag: true
-          tag_latest: true
-          requires:
-            - linter
-            - check-license-headers
-            - test-golang-1.14
-          filters:
-            branches:
-              ignore: /.*/
-            tags:
-              only: /^v.*/
       - dockerhub-upload:
           name: dockerhub-upload-unstable
           tag_branch: true
@@ -237,5 +223,17 @@ workflows:
           filters:
             branches:
               only: enterprise
+      - dockerhub-upload:
+          name: dockerhub-upload-stable
+          tag_branch: true
+          tag_tag: true
+          tag_latest: true
+          requires:
+            - linter
+            - check-license-headers
+            - test-golang-1.14
+          filters:
             tags:
-              ignore: /^v.*/
+              only: /^v.*/
+            branches:
+              ignore: /.*/