From 67b224b340bf60570897836483213a7a95093d03 Mon Sep 17 00:00:00 2001
From: sadnub <josh@torchlake.com>
Date: Sat, 28 Nov 2020 00:23:11 -0500
Subject: [PATCH] get automated builds working

---
 .github/workflows/docker-build-publish.yml | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/docker-build-publish.yml b/.github/workflows/docker-build-publish.yml
index 68d282eb..b53e75ed 100644
--- a/.github/workflows/docker-build-publish.yml
+++ b/.github/workflows/docker-build-publish.yml
@@ -13,15 +13,9 @@ jobs:
       - name: Get Github Tag
         id: prep
         run: |
-          if [[ $GITHUB_REF == refs/tags/* ]]; then
-            VERSION=${GITHUB_REF#refs/tags/v}
-            echo ::set-output name=version::${VERSION}
-          fi
-
+          echo ::set-output name=version::${GITHUB_REF#refs/tags/v}
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
-        env:
-          INPUT_TAGS: ${{ steps.prep.outputs.tags }}, latest
         
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
@@ -40,7 +34,7 @@ jobs:
           pull: true
           file: ./docker/containers/tactical/dockerfile
           platforms: linux/amd64
-          repository: sadnub/tactical
+          tags: tacticalrmm/tactical:${{ steps.prep.outputs.version }},sadnub/tactical:latest
           
       - name: Build and Push Tactical MeshCentral Image
         uses: docker/build-push-action@v2
@@ -50,7 +44,7 @@ jobs:
           pull: true
           file: ./docker/containers/tactical-meshcentral/dockerfile
           platforms: linux/amd64
-          repository: sadnub/tactical-meshcentral
+          tags: tacticalrmm/tactical-meshcentral:${{ steps.prep.outputs.version }},sadnub/tactical-meshcentral:latest
           
       - name: Build and Push Tactical NATS Image
         uses: docker/build-push-action@v2
@@ -60,7 +54,7 @@ jobs:
           pull: true
           file: ./docker/containers/tactical-nats/dockerfile
           platforms: linux/amd64
-          repository: sadnub/tactical-nats
+          tags: tacticalrmm/tactical-nats:${{ steps.prep.outputs.version }},sadnub/tactical-nats:latest
           
       - name: Build and Push Tactical Salt Image
         uses: docker/build-push-action@v2
@@ -70,7 +64,7 @@ jobs:
           pull: true
           file: ./docker/containers/tactical-salt/dockerfile
           platforms: linux/amd64
-          repository: sadnub/tactical-salt
+          tags: tacticalrmm/tactical-salt:${{ steps.prep.outputs.version }},sadnub/tactical-salt:latest
           
       - name: Build and Push Tactical Frontend Image
         uses: docker/build-push-action@v2
@@ -80,7 +74,7 @@ jobs:
           pull: true
           file: ./docker/containers/tactical-frontend/dockerfile
           platforms: linux/amd64
-          repository: sadnub/tactical-frontend
+          tags: tacticalrmm/tactical-frontend:${{ steps.prep.outputs.version }},sadnub/tactical-frontend:latest
           
       - name: Build and Push Tactical Nginx Image
         uses: docker/build-push-action@v2
@@ -90,4 +84,4 @@ jobs:
           pull: true
           file: ./docker/containers/tactical-nginx/dockerfile
           platforms: linux/amd64
-          repository: sadnub/tactical-nginx
+          tags: tacticalrmm/tactical-nginx:${{ steps.prep.outputs.version }},sadnub/tactical-nginx:latest