From ffe1fb9524b91ad389a04c8db3823e4208f9ac65 Mon Sep 17 00:00:00 2001
From: Jonny McCullagh <jonny.mccullagh@redbranch.net>
Date: Mon, 27 Jun 2022 12:35:35 +0100
Subject: [PATCH] WIP: Pipeline for Single Image deploy

---
 .github/workflows/deploy-omnibus-image.yml | 24 ++++------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/deploy-omnibus-image.yml b/.github/workflows/deploy-omnibus-image.yml
index a7c0e4caf8..af9f629eab 100644
--- a/.github/workflows/deploy-omnibus-image.yml
+++ b/.github/workflows/deploy-omnibus-image.yml
@@ -13,7 +13,10 @@ jobs:
     env:
       BASE_BRANCH: ${{ github.event.pull_request.base.ref}}
       BRANCH: ${{ github.event.pull_request.head.ref }}
+      DOCKER_PASSWORD: ${{ secrets.DOCKER_API_KEY }}
+      DOCKER_USER: ${{ secrets.DOCKER_USERNAME }}
       PERSONAL_ACCESS_TOKEN : ${{ secrets.PERSONAL_ACCESS_TOKEN }}
+      REGISTRY_URL: registry.hub.docker.com
     strategy:
       matrix:
         node-version: [14.x]
@@ -38,14 +41,6 @@ jobs:
         env:
           CI: true
           name: Budibase CI
-  test:
-    name: Budibase Single Image Tests
-    runs-on: ubuntu-latest
-    env: 
-      BASE_BRANCH: ${{ github.event.pull_request.base.ref}}
-      BRANCH: ${{ github.event.pull_request.head.ref }}
-      PERSONAL_ACCESS_TOKEN : ${{ secrets.PERSONAL_ACCESS_TOKEN }}
-    steps:
       - name: Test Code Coverage
         uses: codecov/codecov-action@v1
         with:
@@ -58,17 +53,6 @@ jobs:
         with:
           install: false
           command: yarn test:e2e:ci
-  deploy:
-    name: Deploy the Budibase Single Container Image to Docker Hub
-    runs-on: ubuntu-latest
-    env:
-      BASE_BRANCH: ${{ github.event.pull_request.base.ref}}
-      BRANCH: ${{ github.event.pull_request.head.ref }}
-      DOCKER_PASSWORD: ${{ secrets.DOCKER_API_KEY }}
-      DOCKER_USER: ${{ secrets.DOCKER_USERNAME }}
-      PERSONAL_ACCESS_TOKEN : ${{ secrets.PERSONAL_ACCESS_TOKEN }}
-      REGISTRY_URL: registry.hub.docker.com
-    steps:
       - name: Login to Docker Hub
         run: |
           docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
@@ -81,4 +65,4 @@ jobs:
         run: |
           yarn build:docker:single:image
           docker tag budibase $REGISTRY_URL/budibase/single:$RELEASE_TAG
-          docker push  $REGISTRY_URL/budibase/single:$RELEASE_TAG
+          docker push $REGISTRY_URL/budibase/single:$RELEASE_TAG