From 88abbb18d34430aecad8428ce12da7f6ea565787 Mon Sep 17 00:00:00 2001
From: Luke Tainton <luke@tainton.uk>
Date: Sat, 8 Aug 2020 11:08:50 +0100
Subject: [PATCH 1/2] Update deploy.yml

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

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 33fab56..9dbf5aa 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -4,16 +4,31 @@ on:
     branches: main
 
 jobs:
-  deploy:
+  docker-dh:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
     - name: Login to DockerHub Registry
       run: echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
-    - name: Build image
+    - name: Build image for Docker Hub
       run: docker build . --file Dockerfile --tag luketainton/fhed:latest
-    - name: Push image
+    - name: Push image to Docker Hub
       run: docker push luketainton/fhed:latest
+      
+  docker-ghr:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Login to DockerHub Registry
+      run: echo ${{ secrets.GITHUB_TOKEN }} | https://docker.pkg.github.com -u luketainton --password-stdin
+    - name: Build image for GitHub Package Registry
+      run: docker build . --file Dockerfile --tag docker.pkg.github.com/luketainton/FHeD/fhed:latest
+    - name: Push image to GitHub Package Registry
+      run: docker push docker.pkg.github.com/luketainton/FHeD/fhed:latest
+
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
     - name: Update image on server
       uses: garygrossgarten/github-action-ssh@release
       with:
-- 
2.49.1


From c6e37a44dc65d2e4beefb17572eae767b5abb2a9 Mon Sep 17 00:00:00 2001
From: Luke Tainton <luke@tainton.uk>
Date: Sat, 8 Aug 2020 11:14:41 +0100
Subject: [PATCH 2/2] Update deploy.yml

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

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 9dbf5aa..f8750a5 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -5,6 +5,7 @@ on:
 
 jobs:
   docker-dh:
+    name: Push to Docker Hub
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
@@ -16,6 +17,7 @@ jobs:
       run: docker push luketainton/fhed:latest
       
   docker-ghr:
+    name: Push to GitHub Package Registry
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
@@ -28,6 +30,7 @@ jobs:
 
   deploy:
     runs-on: ubuntu-latest
+    needs: [docker-dh]
     steps:
     - name: Update image on server
       uses: garygrossgarten/github-action-ssh@release
-- 
2.49.1