From 2497aaa23620e96cfe13c4a37156596e8ddb200a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Valverd=C3=A9?= <julien.valverde@mailo.com>
Date: Tue, 16 Jul 2024 04:14:30 +0200
Subject: [PATCH] Docker setup work

---
 docker-compose.yml                  | 6 ++++--
 packages/server/src/ServerConfig.ts | 2 +-
 packages/webui/vite.config.ts       | 6 +++++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index b5c693f..9f5c5e5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,12 +1,10 @@
 x-service-base: &service-base
   user: ${UID:?UID missing}:${GID:?GID missing}
   tty: true
-  env_file: .env
 
 x-service-bun: &service-bun
   <<: *service-base
   image: oven/bun
-  working_dir: /app/
 
 x-volume-app: &volume-app ./:/app/
 
@@ -18,8 +16,12 @@ services:
     volumes:
       - *volume-app
     working_dir: /app/packages/server
+    ports:
+      - 80:80
+    env_file: .env
     environment:
       NODE_ENV: development
+      HTTP_PORT: 80
     entrypoint: ["bun", "src/index.ts"]
 
   webui:
diff --git a/packages/server/src/ServerConfig.ts b/packages/server/src/ServerConfig.ts
index ba3b359..eeaf1e6 100644
--- a/packages/server/src/ServerConfig.ts
+++ b/packages/server/src/ServerConfig.ts
@@ -14,7 +14,7 @@ export module ServerConfig {
         Config.withDefault("development"),
     )
 
-    export const httpPort              = Config.number("HTTP_PORT").pipe(Config.withDefault(8080))
+    export const httpPort              = Config.number("HTTP_PORT").pipe(Config.withDefault(80))
     export const rpcHTTPRoot           = Config.string("RPC_HTTP_ROOT").pipe(Config.withDefault("/rpc"))
     export const rpcHTTPPlaygroundRoot = Config.string("RPC_HTTP_PLAYGROUND_ROOT").pipe(Config.withDefault("/rpc/playground"))
 }
diff --git a/packages/webui/vite.config.ts b/packages/webui/vite.config.ts
index 8219166..387bee8 100644
--- a/packages/webui/vite.config.ts
+++ b/packages/webui/vite.config.ts
@@ -5,8 +5,12 @@ import { defineConfig } from "vite"
 
 // https://vitejs.dev/config/
 export default defineConfig({
+    server: {
+        port: 80,
+    },
+
     plugins: [
         TanStackRouterVite(),
         react(),
-    ]
+    ],
 })