From f4c74b0ee2c86047d6865a60022db7986408099e Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Mon, 21 Jun 2021 16:25:12 +0100
Subject: [PATCH] add develop tag and update docker push script

---
 .github/workflows/budibase_ci.yml              | 4 ++--
 hosting/scripts/linux/release-to-docker-hub.sh | 8 ++++----
 package.json                                   | 2 +-
 packages/server/package.json                   | 2 +-
 packages/worker/package.json                   | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 75e890abc2..3f0ecd84c5 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -43,13 +43,13 @@ jobs:
         verbose: true 
     - run: yarn test:e2e:ci
 
-    - name: Build and Push Staging Docker Image
+    - name: Build and Push Development Docker Image
       # Only run on push
       if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/develop' }}
       run: |
         docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
         yarn build
-        yarn build:docker:staging
+        yarn build:docker:develop
       env:
         DOCKER_USER: ${{ secrets.DOCKER_USERNAME }}
         DOCKER_PASSWORD: ${{ secrets.DOCKER_API_KEY }}
diff --git a/hosting/scripts/linux/release-to-docker-hub.sh b/hosting/scripts/linux/release-to-docker-hub.sh
index b1a79c964c..8fd162b1a6 100755
--- a/hosting/scripts/linux/release-to-docker-hub.sh
+++ b/hosting/scripts/linux/release-to-docker-hub.sh
@@ -5,12 +5,12 @@ tag=${tag:-latest}
 
 echo "Tagging images with SHA: $GITHUB_SHA and tag: $tag"
 
-docker tag app-service budibase/apps:$tag
-docker tag worker-service budibase/worker:$tag
+docker tag app-service:$tag budibase/apps:$tag
+docker tag worker-service:$tag budibase/worker:$tag
 
 # Tag with git sha
-docker tag app-service budibase/apps:$GITHUB_SHA
-docker tag worker-service budibase/worker:$GITHUB_SHA
+docker tag app-service:$tag budibase/apps:$GITHUB_SHA
+docker tag worker-service:$tag budibase/worker:$GITHUB_SHA
 
 docker push budibase/apps
 docker push budibase/worker
diff --git a/package.json b/package.json
index 877cd8959c..bd11e9ee7b 100644
--- a/package.json
+++ b/package.json
@@ -41,6 +41,6 @@
     "test:e2e": "lerna run cy:test",
     "test:e2e:ci": "lerna run cy:ci",
     "build:docker": "lerna run build:docker && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh && cd -",
-    "build:docker:staging": "lerna run build:docker:staging && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh staging && cd -"
+    "build:docker:develop": "lerna run build:docker:develop && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh develop && cd -"
   }
 }
diff --git a/packages/server/package.json b/packages/server/package.json
index 2b0e4d7ada..402109c2d8 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -13,7 +13,7 @@
     "test:integration": "jest --coverage --detectOpenHandles",
     "test:watch": "jest --watch",
     "build:docker": "docker build . -t app-service",
-    "build:docker:staging": "docker build . -t app-service:staging",
+    "build:docker:develop": "docker build . -t app-service:develop",
     "run:docker": "node src/index",
     "dev:stack:up": "node scripts/dev/manage.js up",
     "dev:stack:down": "node scripts/dev/manage.js down",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 3e015de271..9d474037d6 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -14,7 +14,7 @@
   "scripts": {
     "run:docker": "node src/index.js",
     "build:docker": "docker build . -t worker-service",
-    "build:docker:staging": "docker build . -t worker-service:staging",
+    "build:docker:develop": "docker build . -t worker-service:develop",
     "dev:stack:init": "node ./scripts/dev/manage.js init",
     "dev:builder": "npm run dev:stack:init && nodemon src/index.js",
     "test": "jest --runInBand"