From b190776d81e733f818167b353447b65e801b61fb Mon Sep 17 00:00:00 2001
From: Luke Tainton <luke@tainton.uk>
Date: Mon, 17 Aug 2020 11:14:48 +0100
Subject: [PATCH] Fix auto deployment and versioning (#110)

* :bug: Fix docker build syntax

* Add tag as output
---
 .github/workflows/deploy.yml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 01081fe..92a67fd 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -8,6 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     outputs: 
       ver: ${{ steps.release.outputs.version }}
+      tag: ${{ steps.release.outputs.tag_name }}
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
@@ -32,12 +33,14 @@ jobs:
     - name: Build image for Docker Hub
       env:
         VERSION: ${{ needs.release-on-push.output.ver }}
-      run: docker build . --file Dockerfile --tag luketainton/fhed:$VERSION luketainton/fhed:latest
+        TAG: ${{ needs.release-on-push.output.tag }}
+      run: docker build . --file Dockerfile --build-arg VERSION --tag luketainton/fhed:$TAG --tag luketainton/fhed:latest
     - name: Push image to Docker Hub
       env:
         VERSION: ${{ needs.release-on-push.output.ver }}
+        TAG: ${{ needs.release-on-push.output.tag }}
       run: |
-        docker push luketainton/fhed:$VERSION &&
+        docker push luketainton/fhed:$TAG &&
         docker push luketainton/fhed:latest
       
   docker-ghr:
@@ -51,12 +54,14 @@ jobs:
     - name: Build image for GitHub Package Registry
       env:
         VERSION: ${{ needs.release-on-push.output.ver }}
-      run: docker build . --file Dockerfile --tag docker.pkg.github.com/luketainton/fhed/fhed:latest docker.pkg.github.com/luketainton/fhed/fhed:$VERSION
+        TAG: ${{ needs.release-on-push.output.tag }}
+      run: docker build . --file Dockerfile --build-arg VERSION --tag docker.pkg.github.com/luketainton/fhed/fhed:latest --tag docker.pkg.github.com/luketainton/fhed/fhed:$TAG
     - name: Push image to GitHub Package Registry
       env:
         VERSION: ${{ needs.release-on-push.output.ver }}
+        TAG: ${{ needs.release-on-push.output.tag }}
       run: |
-        docker push docker.pkg.github.com/luketainton/fhed/fhed:$VERSION &&
+        docker push docker.pkg.github.com/luketainton/fhed/fhed:$TAG &&
         docker push docker.pkg.github.com/luketainton/fhed/fhed:latest
 
   deploy: