diff --git a/Caddyfile b/Caddyfile deleted file mode 100644 index 1fcaba49a..000000000 --- a/Caddyfile +++ /dev/null @@ -1,7 +0,0 @@ -{$HOST_URL} { - reverse_proxy client:3000 - handle_path /api/* { - reverse_proxy server:8080 - rewrite * {uri} - } -} diff --git a/apps/OpenSign/package.json b/apps/OpenSign/package.json index a9a8943b1..eb7034d91 100644 --- a/apps/OpenSign/package.json +++ b/apps/OpenSign/package.json @@ -11,6 +11,7 @@ "@reduxjs/toolkit": "^2.8.2", "axios": "^1.10.0", "date-fns-tz": "^3.2.0", + "env-cmd": "", "file-saver": "^2.0.5", "i18next": "^25.3.0", "i18next-browser-languagedetector": "^8.2.0", @@ -57,7 +58,7 @@ "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz" }, "scripts": { - "build": "npm run version && NODE_OPTIONS=\"--max-old-space-size=8192\" vite build", + "build": "npm run version && NODE_OPTIONS=\"--max-old-space-size=8192\" env-cmd -f .env vite build", "start-dev": "vite", "dev": "vite", "preview": "vite preview", @@ -130,4 +131,4 @@ "engines": { "node": "18 || 20 || 22" } -} \ No newline at end of file +} diff --git a/apps/OpenSign/vite.config.js b/apps/OpenSign/vite.config.js index 73567adeb..9c876cde0 100644 --- a/apps/OpenSign/vite.config.js +++ b/apps/OpenSign/vite.config.js @@ -1,4 +1,4 @@ -import { defineConfig, splitVendorChunkPlugin } from "vite"; +import { defineConfig, splitVendorChunkPlugin, searchForWorkspaceRoot } from "vite"; import react from "@vitejs/plugin-react"; import svgr from "vite-plugin-svgr"; import { resolve } from "path"; @@ -41,7 +41,13 @@ export default defineConfig(({ command, mode }) => { } }, server: { - port: process.env.PORT || 3000, // Same port as CRA + fs: { + allow: [ + searchForWorkspaceRoot(process.cwd()), + '/opt/opensign', + ], + }, + port: process.env.PORT || 3000, // Same port as CRA open: true }, test: { diff --git a/docker-compose.yml b/docker-compose.yml index 577c1ed74..551c0139b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,8 +11,8 @@ services: env_file: .env.prod environment: - NODE_ENV=production - - SERVER_URL=${HOST_URL:-https://localhost:3001}/api/app - - PUBLIC_URL=${HOST_URL:-https://localhost:3001} + - SERVER_URL=${HOST_URL:?err}/api/app + - PUBLIC_URL=${HOST_URL:?err} networks: - app-network mongo: @@ -34,22 +34,6 @@ services: - "3000:3000" networks: - app-network - caddy: - image: caddy:latest - container_name: caddy-container - ports: - - "3001:3001" - - "80:80" - - "443:443" - - "443:443/udp" - volumes: - - ./Caddyfile:/etc/caddy/Caddyfile - - caddy_data:/data - - caddy_config:/config - networks: - - app-network - environment: - - HOST_URL=${HOST_URL:-localhost:3001} networks: app-network: driver: bridge @@ -57,6 +41,4 @@ networks: volumes: data-volume: web-root: - caddy_data: - caddy_config: opensign-files: