From d8d0f234c23696c9919cc8655c01f47548d3b991 Mon Sep 17 00:00:00 2001
From: James Barnsley <james@barnsley.nz>
Date: Sun, 24 Oct 2021 12:46:42 +1300
Subject: [PATCH] Splitting develop vs latest docker builds; Tox config

---
 .github/workflows/build-docker-latest.yml | 43 +++++++++++++++++++++++
 .github/workflows/build-docker.yml        |  4 +--
 2 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 .github/workflows/build-docker-latest.yml

diff --git a/.github/workflows/build-docker-latest.yml b/.github/workflows/build-docker-latest.yml
new file mode 100644
index 00000000..7d5efa4b
--- /dev/null
+++ b/.github/workflows/build-docker-latest.yml
@@ -0,0 +1,43 @@
+name: Build Docker
+
+on:
+  push:
+    branches: [deploy/release,deploy/force-release]
+
+jobs:
+  build-and-push-docker-image:
+    name: Build image and push to DockerHub
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+  
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Login to Github Packages
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GHCR_PAT }}
+      
+      - name: Build image and push to Docker Hub and GitHub Container Registry
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          tags: |
+            jaedb/iris:latest
+          # build on feature branches, push only on master branch
+          push: ${{ github.ref == 'refs/heads/master' }}
+
+      - name: Image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}
diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
index dd864ca3..cff66b0c 100644
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -2,7 +2,7 @@ name: Build Docker
 
 on:
   push:
-    branches: [master,deploy/release,deploy/force-release]
+    branches: [develop]
 
 jobs:
   build-and-push-docker-image:
@@ -35,7 +35,7 @@ jobs:
         with:
           context: .
           tags: |
-            jaedb/iris:master
+            jaedb/iris:develop
           # build on feature branches, push only on master branch
           push: ${{ github.ref == 'refs/heads/master' }}