From 42b75a1ec3fb842514ae906471b35371274d5e60 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 2 Oct 2023 17:50:02 +0200
Subject: [PATCH] Use script

---
 package.json                  | 3 +--
 packages/bbui/package.json    | 4 ++--
 scripts/build-single-image.sh | 5 +++++
 3 files changed, 8 insertions(+), 4 deletions(-)
 create mode 100755 scripts/build-single-image.sh

diff --git a/package.json b/package.json
index c3751b4a31..fc98879e95 100644
--- a/package.json
+++ b/package.json
@@ -68,8 +68,7 @@
     "build:docker:airgap:single": "SINGLE_IMAGE=1 node hosting/scripts/airgapped/airgappedDockerBuild",
     "build:digitalocean": "cd hosting/digitalocean && ./build.sh && cd -",
     "build:docker:single:multiarch": "docker buildx build --platform linux/arm64,linux/amd64 -f hosting/single/Dockerfile -t budibase:latest .",
-    "build:docker:single:image": "docker build -f hosting/single/Dockerfile -t budibase:latest .",
-    "build:docker:single": "yarn build && yarn build:docker:single:image",
+    "build:docker:single": "./scripts/build-single-image.sh",
     "build:docker:dependencies": "docker build -f hosting/dependencies/Dockerfile -t budibase/dependencies:latest ./hosting",
     "publish:docker:couch": "docker buildx build --platform linux/arm64,linux/amd64 -f hosting/couchdb/Dockerfile -t budibase/couchdb:latest -t budibase/couchdb:v3.2.1 --push ./hosting/couchdb",
     "publish:docker:dependencies": "docker buildx build --platform linux/arm64,linux/amd64 -f hosting/dependencies/Dockerfile -t budibase/dependencies:latest -t budibase/dependencies:v3.2.1 --push ./hosting",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 4791776c57..78eed2b608 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -82,9 +82,9 @@
     "@spectrum-css/vars": "3.0.1",
     "dayjs": "^1.10.8",
     "easymde": "^2.16.1",
+    "svelte-dnd-action": "^0.9.8",
     "svelte-flatpickr": "3.2.3",
-    "svelte-portal": "^1.0.0",
-    "svelte-dnd-action": "^0.9.8"
+    "svelte-portal": "^1.0.0"
   },
   "resolutions": {
     "loader-utils": "1.4.1"
diff --git a/scripts/build-single-image.sh b/scripts/build-single-image.sh
new file mode 100755
index 0000000000..b7f40da0e5
--- /dev/null
+++ b/scripts/build-single-image.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+source ${BASH_SOURCE%/*}/updateVersions.sh
+yarn build --scope @budibase/server --scope @budibase/worker
+docker build -f hosting/single/Dockerfile -t budibase:latest .
+source ${BASH_SOURCE%/*}/resetVersions.sh