From 64e3b2a173903cca29c3d44de4b68c30f8368fa6 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@budibase.com>
Date: Thu, 20 May 2021 12:57:29 +0100
Subject: [PATCH 1/2] Update release.yml

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

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fa06e31a72..da4eb4161c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -2,12 +2,13 @@ name: Budibase Release
 
 on: 
  push:
-  branches:
-    - master
+    branches:
+      - master
  pull_request:
     branches:
       - master
 
+
 jobs:
   release:
     runs-on: ubuntu-latest 
@@ -37,4 +38,4 @@ jobs:
           DOCKER_USER: ${{ secrets.DOCKER_USERNAME }}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_API_KEY }}
         run: docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
-        run: yarn build:docker
\ No newline at end of file
+        run: yarn build:docker

From 98496b4a01e3bfff21d5e9e49933bd0bccc3afad Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@budibase.com>
Date: Thu, 20 May 2021 13:00:07 +0100
Subject: [PATCH 2/2] Update release.yml

---
 .github/workflows/release.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index da4eb4161c..dc1bfc3f4e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -34,8 +34,9 @@ jobs:
       #   run: yarn release
 
       - name: Build/release Docker images
+        run: | 
+          docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
+          yarn build:docker
         env:
           DOCKER_USER: ${{ secrets.DOCKER_USERNAME }}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_API_KEY }}
-        run: docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
-        run: yarn build:docker