Merge remote-tracking branch 'wg-easy/master'

Dartegnian · May 1, 2024 · 2cb97e8 · 2cb97e8
2 parents 0db9ab3 + 9b5b8c7
commit 2cb97e8
Show file tree

Hide file tree

Showing 6 changed files with 194 additions and 176 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1 @@
+/src/node_modules
diff --git a/Dockerfile b/Dockerfile
@@ -3,13 +3,9 @@
 FROM docker.io/library/node:18-alpine AS build_node_modules
 
 # Copy Web UI
-COPY src/ /app/
+COPY src /app
 WORKDIR /app
 RUN npm ci --omit=dev &&\
-    # Enable this to run `npm run serve`
-    npm i -g nodemon &&\
-    # Delete unnecessary files 
-    npm cache clean --force && rm -rf ~/.npm &&\
     mv node_modules /node_modules
 
 # Copy build result to a new image.

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "version": "1.0.1",
   "scripts": {
     "build": "DOCKER_BUILDKIT=1 docker build --tag wg-easy-m3 .",
-    "serve": "docker-compose -f docker-compose.yml -f docker-compose.dev.yml up",
+    "serve": "docker compose -f docker-compose.yml -f docker-compose.dev.yml up",
     "start": "docker run --env WG_HOST=0.0.0.0 --name wg-easy-m3 --cap-add=NET_ADMIN --cap-add=SYS_MODULE --sysctl=\"net.ipv4.conf.all.src_valid_mark=1\" --mount type=bind,source=\"$(pwd)\"/config,target=/etc/wireguard -p 51820:51820/udp -p 51821:51821/tcp wg-easy-m3"
   }
 }