From f4b75b8f50dc6b09fb157e7735d96ae7e5677bf4 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 13 Jul 2022 16:39:38 +0100
Subject: [PATCH] Fix for single image build, make sure predocker commands
 always ran.

---
 .github/workflows/deploy-single-image.yml | 2 +-
 package.json                              | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/deploy-single-image.yml b/.github/workflows/deploy-single-image.yml
index 4a04bf3f98..7829c5417b 100644
--- a/.github/workflows/deploy-single-image.yml
+++ b/.github/workflows/deploy-single-image.yml
@@ -40,7 +40,7 @@ jobs:
       - name: Runt Yarn Lint
         run: yarn lint
       - name: Run Yarn Build
-        run: yarn build
+        run: yarn build:docker:pre
       - name: Login to Docker Hub
         uses: docker/login-action@v2
         with:
diff --git a/package.json b/package.json
index b787b4aee5..d9d16e5ea8 100644
--- a/package.json
+++ b/package.json
@@ -54,6 +54,7 @@
     "test:e2e:ci:notify": "lerna run cy:ci:notify",
     "build:specs": "lerna run specs",
     "build:docker": "lerna run build:docker && npm run build:docker:proxy:compose && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh $BUDIBASE_RELEASE_VERSION && cd -",
+    "build:docker:pre": "lerna run build && lerna run predocker",
     "build:docker:proxy": "docker build hosting/proxy -t proxy-service",
     "build:docker:proxy:compose": "node scripts/proxy/generateProxyConfig compose && npm run build:docker:proxy",
     "build:docker:proxy:preprod": "node scripts/proxy/generateProxyConfig preprod && npm run build:docker:proxy",
@@ -65,7 +66,7 @@
     "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": "lerna run build && lerna run predocker && npm run build:docker:single:image",
+    "build:docker:single": "yarn build:docker:pre && npm run build:docker:single:image",
     "build:docs": "lerna run build:docs",
     "release:helm": "node scripts/releaseHelmChart",
     "env:multi:enable": "lerna run env:multi:enable",
@@ -84,4 +85,4 @@
     "install:pro": "bash scripts/pro/install.sh",
     "dep:clean": "yarn clean && yarn bootstrap"
   }
-}
\ No newline at end of file
+}