From 37d4e0bf863e4c307c983d8f0ddd40a10988db23 Mon Sep 17 00:00:00 2001
From: Josh Larson <Josh-Larson@users.noreply.github.com>
Date: Sat, 26 Oct 2019 07:29:21 -0400
Subject: [PATCH 1/2] Update deploy-qa.yml

---
 .github/workflows/deploy-qa.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/deploy-qa.yml b/.github/workflows/deploy-qa.yml
index 5152d5944..d33c532b4 100644
--- a/.github/workflows/deploy-qa.yml
+++ b/.github/workflows/deploy-qa.yml
@@ -4,7 +4,7 @@ on:
   release:
     types: [published]
     branches:
-      - quality_assurance
+    - quality_assurance
 
 jobs:
   deploy:
@@ -26,12 +26,12 @@ jobs:
     - name: Docker Build
       run: |
         IMAGE_NAME=`echo "docker.pkg.github.com/${GITHUB_REPOSITORY,,}/holocore"`
-        RELEASE_NAME=`echo "refs/tags/OCT19-rc1" | sed 's/refs\/tags\///g'`
+        RELEASE_NAME=`echo $GITHUB_REF | sed 's/refs\/tags\///g'`
         docker build -t "$IMAGE_NAME:$RELEASE_NAME" .
         docker tag "$IMAGE_NAME:$RELEASE_NAME" "$IMAGE_NAME:quality_assurance"
     - name: Docker Push
       run: |
         IMAGE_NAME=`echo "docker.pkg.github.com/${GITHUB_REPOSITORY,,}/holocore"`
-        RELEASE_NAME=`echo "refs/tags/OCT19-rc1" | sed 's/refs\/tags\///g'`
+        RELEASE_NAME=`echo $GITHUB_REF | sed 's/refs\/tags\///g'`
         docker push "$IMAGE_NAME:$RELEASE_NAME"
         docker push "$IMAGE_NAME:quality_assurance"

From 924c33ddd5281f48d502582370a0d19dbfa3d4ca Mon Sep 17 00:00:00 2001
From: Josh Larson <Josh-Larson@users.noreply.github.com>
Date: Sat, 26 Oct 2019 07:30:36 -0400
Subject: [PATCH 2/2] Update deploy-master.yml

---
 .github/workflows/deploy-master.yml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/deploy-master.yml b/.github/workflows/deploy-master.yml
index d38e5ae05..cc8c14682 100644
--- a/.github/workflows/deploy-master.yml
+++ b/.github/workflows/deploy-master.yml
@@ -4,7 +4,7 @@ on:
   release:
     types: [published]
     branches:
-      - master
+    - master
 
 jobs:
   deploy:
@@ -25,9 +25,13 @@ jobs:
       run: docker login docker.pkg.github.com -u "${{ secrets.DOCKER_USER }}" -p "${{ secrets.DOCKER_PASS }}"
     - name: Docker Build
       run: |
-        docker build -t "${{secrets.DOCKER_IMAGE }}:$GITHUB_REF" .
-        docker tag "${{secrets.DOCKER_IMAGE }}:$GITHUB_REF" "${{secrets.DOCKER_IMAGE }}:master"
+        IMAGE_NAME=`echo "docker.pkg.github.com/${GITHUB_REPOSITORY,,}/holocore"`
+        RELEASE_NAME=`echo $GITHUB_REF | sed 's/refs\/tags\///g'`
+        docker build -t "$IMAGE_NAME:$RELEASE_NAME" .
+        docker tag "$IMAGE_NAME:$RELEASE_NAME" "$IMAGE_NAME:latest"
     - name: Docker Push
       run: |
-        docker push "${{secrets.DOCKER_IMAGE }}:$GITHUB_REF"
-        docker push "${{secrets.DOCKER_IMAGE }}:master"
+        IMAGE_NAME=`echo "docker.pkg.github.com/${GITHUB_REPOSITORY,,}/holocore"`
+        RELEASE_NAME=`echo $GITHUB_REF | sed 's/refs\/tags\///g'`
+        docker push "$IMAGE_NAME:$RELEASE_NAME"
+        docker push "$IMAGE_NAME:latest"