From 69b9bc08a764d1f1b2d70c34b0a775ba63fd2509 Mon Sep 17 00:00:00 2001
From: James Barnsley <james@barnsley.nz>
Date: Sat, 19 Nov 2022 09:10:59 +1300
Subject: [PATCH] Configuring docker image tagging - Ditching deploy/release,
 will release on push to master - Tag branch + version + major.minor

---
 .github/workflows/ci.yml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 26c1d466..04871b92 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,7 +2,7 @@ name: Release
 
 on:
   push:
-    branches: [master,develop,deploy/release]
+    branches: [master,develop]
 
 jobs:
   jest:
@@ -85,7 +85,7 @@ jobs:
     name: 'Publish: PyPi'
     runs-on: ubuntu-latest
     needs: [jest, tox]
-    if: github.ref == 'refs/heads/deploy/release'
+    if: github.ref == 'refs/heads/master'
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
@@ -125,7 +125,7 @@ jobs:
     name: 'Publish: DockerHub'
     runs-on: ubuntu-latest
     needs: [jest, tox]
-    if: github.ref == 'refs/heads/deploy/release'
+    if: github.ref == 'refs/heads/master'
     steps:
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
@@ -138,6 +138,10 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: jaedb/iris
+          tags: |
+            type=ref,event=push
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
 
       - name: Login to DockerHub
         uses: docker/login-action@v1