From ba6e1a77f0650cc4f5839520e0937a9435e4e2fc Mon Sep 17 00:00:00 2001
From: Juhani Pelli <juhani.pelli@gmail.com>
Date: Mon, 5 Aug 2024 00:29:01 +0300
Subject: [PATCH] Build prod version of configurator

---
 .dockerignore                      |   6 +++++-
 bun.lockb                          | Bin 467184 -> 467184 bytes
 packages/configurator/Dockerfile   |  20 +++++++++++++++++---
 packages/configurator/Taskfile.yml |   6 ++++++
 packages/configurator/package.json |  10 +++++-----
 5 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 76add87..7953c4b 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,2 +1,6 @@
 node_modules
-dist
\ No newline at end of file
+node_modules.bun
+dist
+build
+.cache
+.khz-k3s
\ No newline at end of file
diff --git a/bun.lockb b/bun.lockb
index a3cb346ff1e36cb7f7b3048d71b6d462cb743b6b..2bd1ce41552d73bf8bb461f4cb790a53d8e2f8da 100755
GIT binary patch
delta 110
zcmexxQ0BuynT8g|7N!>F7M3ln2l!+S^$ZxUbTBYTFfcTn(zrJ1!K6N24aPVlJwu?(
y_Pczn(u~uK%2-8|m0*GlVVw*N0zl=tYa-^n7Czn&muc4*U<G2f?fL@j2L%AFXCQw7

delta 125
zcmexxQ0BuynT8g|7N!>F7M3ln2l!+S^o$v<bTBYTFfcTn(zrJ1!K6N24aPVlJwu?(
z_Pczn(v0RHHEx{@3<5wko7da@sQmiwyb??eLl{&hcTL2c*TTp9;WF*|0<1vHwq0L<
H{h$B<A@wG<

diff --git a/packages/configurator/Dockerfile b/packages/configurator/Dockerfile
index 7353f69..0e80df5 100644
--- a/packages/configurator/Dockerfile
+++ b/packages/configurator/Dockerfile
@@ -1,9 +1,23 @@
-FROM ghcr.io/unkhz/ruuvipuserrin-base-bun
+FROM ghcr.io/unkhz/ruuvipuserrin-base-bun AS build
 
 WORKDIR /app
 
+# Install dev deps for build
+RUN bun install --frozen-lockfile
+
+WORKDIR /app/packages/configurator
+
+RUN bun x remix vite:build
+
+#########################################
+FROM node:20-alpine
+
+WORKDIR /app
+
+COPY --link --from=build /app/packages/configurator/build ./build
+
 EXPOSE 3000
 
-ENV PORT 3000
+ENV PORT=3000
 
-CMD ["bun", "x", "@remix-run/serve", "packages/configurator/build/server/index.js"]
\ No newline at end of file
+CMD ["npx", "remix-serve", "packages/configurator/build/server/index.js"]
\ No newline at end of file
diff --git a/packages/configurator/Taskfile.yml b/packages/configurator/Taskfile.yml
index 57feaec..23fd9da 100644
--- a/packages/configurator/Taskfile.yml
+++ b/packages/configurator/Taskfile.yml
@@ -12,6 +12,12 @@ tasks:
     cmds:
       - bun x remix vite:dev
 
+  serve:
+    desc: Run in development mode
+    cmds:
+      # Can't run with bun yet, see https://github.com/remix-run/remix/discussions/7413
+      - npx remix-serve build/server/index.js
+
   lint:
     desc: Run ESLint
     cmds:
diff --git a/packages/configurator/package.json b/packages/configurator/package.json
index c6923eb..facafe8 100644
--- a/packages/configurator/package.json
+++ b/packages/configurator/package.json
@@ -5,17 +5,17 @@
   "type": "module",
   "dependencies": {
     "@ruuvipuserrin/common-archive-client": "workspace:*",
-    "@remix-run/node": "^2.10.3",
-    "@remix-run/react": "^2.10.3",
-    "@remix-run/serve": "^2.10.3",
+    "@remix-run/node": "^2.11.0",
+    "@remix-run/react": "^2.11.0",
+    "@remix-run/serve": "^2.11.0",
     "cross-env": "^7.0.3",
     "daisyui": "^2.50.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@remix-run/dev": "^2.10.3",
-    "@remix-run/eslint-config": "^2.10.3",
+    "@remix-run/dev": "^2.11.0",
+    "@remix-run/eslint-config": "^2.11.0",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
     "eslint": "^8.27.0",