From 2f4e85c64ec825a32ca9fc8970e63d9ce16caa8c Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Mon, 21 Jun 2021 16:44:54 +0100
Subject: [PATCH] consolidate build

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

diff --git a/hosting/scripts/linux/release-to-docker-hub.sh b/hosting/scripts/linux/release-to-docker-hub.sh
index 8fd162b1a6..b1a79c964c 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:$tag budibase/apps:$tag
-docker tag worker-service:$tag budibase/worker:$tag
+docker tag app-service budibase/apps:$tag
+docker tag worker-service budibase/worker:$tag
 
 # Tag with git sha
-docker tag app-service:$tag budibase/apps:$GITHUB_SHA
-docker tag worker-service:$tag budibase/worker:$GITHUB_SHA
+docker tag app-service budibase/apps:$GITHUB_SHA
+docker tag worker-service budibase/worker:$GITHUB_SHA
 
 docker push budibase/apps
 docker push budibase/worker
diff --git a/package.json b/package.json
index bd11e9ee7b..5a0a0d7495 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:develop": "lerna run build:docker:develop && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh develop && cd -"
+    "build:docker:develop": "lerna run build:docker && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh develop && cd -"
   }
 }
diff --git a/packages/server/package.json b/packages/server/package.json
index 402109c2d8..25cfe508b6 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -13,7 +13,6 @@
     "test:integration": "jest --coverage --detectOpenHandles",
     "test:watch": "jest --watch",
     "build:docker": "docker build . -t app-service",
-    "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 9d474037d6..6cb480acd2 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -14,7 +14,6 @@
   "scripts": {
     "run:docker": "node src/index.js",
     "build:docker": "docker build . -t worker-service",
-    "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"