Move server, bind www folder

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"]

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

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'),

webui/package.json

@@ -6,6 +6,7 @@
   "scripts": {
     "dev": "vite",
     "build": "vite build",
+    "build:watch": "vite build --watch",
     "preview": "vite preview"
   },
   "dependencies": {