From 6d1e8310f205bbf15b7c91642b8472c8b53f6810 Mon Sep 17 00:00:00 2001
From: Daniil Isakov <12859907+oplexz@users.noreply.github.com>
Date: Fri, 12 Jan 2024 19:06:33 +0300
Subject: [PATCH] Move server, bind www folder

---
 Dockerfile             | 6 +++---
 docker-compose.dev.yml | 3 ++-
 src/lib/Server.js      | 2 +-
 webui/package.json     | 1 +
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 969d2711..8bf6a363 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,7 +19,7 @@ RUN npm ci --omit=dev
 FROM docker.io/library/node:18-alpine
 
 # Copy the server files and the built static files
-COPY --from=build_node_modules /server /app
+COPY --from=build_node_modules /server /app/server
 COPY --from=build_node_modules /webui/dist /app/www
 
 # Move node_modules one directory up, so during development
@@ -29,7 +29,7 @@ COPY --from=build_node_modules /webui/dist /app/www
 # Also, some node_modules might be native, and
 # the architecture & OS of your development machine might differ
 # than what runs inside of docker.
-RUN mv /app/node_modules /node_modules
+RUN mv /app/server/node_modules /app/node_modules
 
 # Enable this to run `npm run serve`
 RUN npm i -g nodemon
@@ -53,5 +53,5 @@ EXPOSE 51821/tcp
 ENV DEBUG=Server,WireGuard
 
 # Run Web UI
-WORKDIR /app
+WORKDIR /app/server
 CMD ["/usr/bin/dumb-init", "node", "server.js"]
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 08e46978..91673bce 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -4,7 +4,8 @@ services:
     image: wg-easy
     command: npm run serve
     volumes:
-      - ./src/:/app/
+      - ./src/:/app/server
+      - ./webui/dist:/app/www
     environment:
       # - PASSWORD=p
       - WG_HOST=192.168.1.233
diff --git a/src/lib/Server.js b/src/lib/Server.js
index a76e0f47..9a102633 100644
--- a/src/lib/Server.js
+++ b/src/lib/Server.js
@@ -25,7 +25,7 @@ module.exports = class Server {
     // Express
     this.app = express()
       .disable('etag')
-      .use('/', express.static(path.join(__dirname, '..', 'www')))
+      .use('/', express.static(path.join(__dirname, '..', '..', 'www')))
       .use(express.json())
       .use(expressSession({
         secret: crypto.randomBytes(256).toString('hex'),
diff --git a/webui/package.json b/webui/package.json
index 379ce505..7453a99d 100644
--- a/webui/package.json
+++ b/webui/package.json
@@ -6,6 +6,7 @@
   "scripts": {
     "dev": "vite",
     "build": "vite build",
+    "build:watch": "vite build --watch",
     "preview": "vite preview"
   },
   "dependencies": {