From 3067bf5eaf8e08e3e190fcb79d996a833374718f Mon Sep 17 00:00:00 2001
From: RoyUP9 <87927115+RoyUP9@users.noreply.github.com>
Date: Mon, 24 Jan 2022 18:11:45 +0200
Subject: [PATCH 1/2] Fixed ui split (#690)

---
 Dockerfile      | 2 +-
 ui/package.json | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 9be281430..1a9485057 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ COPY ui/package-lock.json .
 RUN npm i
 COPY ui .
 RUN npm run build
-
+RUN npm run build-ent
 
 FROM golang:1.16-alpine AS builder
 # Set necessary environment variables needed for our image.
diff --git a/ui/package.json b/ui/package.json
index 73f2aae7e..84730a74d 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -49,7 +49,8 @@
   "scripts": {
     "start": "craco start",
     "start-ent": "./node_modules/.bin/env-cmd -f .env.enterprise craco start",
-    "build": "./node_modules/.bin/env-cmd -f .env.basic craco build & BUILD_PATH='./build-ent' ./node_modules/.bin/env-cmd -f .env.enterprise craco build",
+    "build": "./node_modules/.bin/env-cmd -f .env.basic craco build",
+    "build-ent": "BUILD_PATH='./build-ent' ./node_modules/.bin/env-cmd -f .env.enterprise craco build",
     "test": "craco test",
     "eject": "craco eject"
   },

From 85edd6e5b09db12c85a78a473488704b06624b8a Mon Sep 17 00:00:00 2001
From: Gustavo Massaneiro <gustavomassa123@gmail.com>
Date: Mon, 24 Jan 2022 13:52:09 -0300
Subject: [PATCH 2/2] updated debug.Dockerfile with the latest changes for the
 ui split build (#691)

---
 debug.Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/debug.Dockerfile b/debug.Dockerfile
index 9bf2754b5..b386e2e1d 100644
--- a/debug.Dockerfile
+++ b/debug.Dockerfile
@@ -8,6 +8,7 @@ COPY ui/package-lock.json .
 RUN npm i
 COPY ui .
 RUN npm run build
+RUN npm run build-ent
 
 FROM golang:1.16-alpine AS builder
 # Set necessary environment variables needed for our image.
@@ -52,6 +53,7 @@ WORKDIR /app
 COPY --from=builder ["/app/agent-build/mizuagent", "."]
 COPY --from=builder ["/app/agent/build/extensions", "extensions"]
 COPY --from=site-build ["/app/ui-build/build", "site"]
+COPY --from=site-build ["/app/ui-build/build-ent", "site-standalone"]
 RUN mkdir /app/data/
 
 # install delve