From 3bc1ea0bb3c31ee1386de312661e4d0d08658aba Mon Sep 17 00:00:00 2001
From: James Barnsley <james@barnsley.nz>
Date: Mon, 2 Jan 2023 21:58:32 +1300
Subject: [PATCH] Build Docker image for any push to develop or master

---
 .github/workflows/ci.yml | 13 +++++++++++--
 MANIFEST.in              |  3 ++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b3a4d5f0..332ac3bd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -127,7 +127,7 @@ jobs:
     name: 'Publish: DockerHub'
     runs-on: ubuntu-latest
     needs: [jest, tox]
-    if: github.event_name == 'release'
+    if: github.event_name == 'release' || github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/master'
     steps:
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
@@ -135,7 +135,8 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
 
-      - name: Generating tags and labels
+      - name: Generating release tags and labels
+        if: github.event_name == 'release'
         id: meta
         uses: docker/metadata-action@v4
         with:
@@ -145,6 +146,14 @@ jobs:
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
 
+      - name: Generating branch labels
+        if: github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/master'
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: jaedb/iris
+          tags: ${{ github.ref##*/ }}
+
       - name: Login to DockerHub
         uses: docker/login-action@v1 
         with:
diff --git a/MANIFEST.in b/MANIFEST.in
index 7a512fc1..0957ae8a 100755
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -15,4 +15,5 @@ recursive-exclude src *
 recursive-exclude docker *
 exclude .jshintrc
 exclude .babelrc
-exclude jest.config.js
\ No newline at end of file
+exclude jest.config.js
+exclude .nvmrc
\ No newline at end of file