improve docker dev

only install dependencies if changed

.vscode/settings.json

@@ -12,13 +12,12 @@
   "[typescript]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
+  "[json]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
   "typescript.tsdk": "./src/node_modules/typescript/lib",
-  "i18n-ally.enabledFrameworks": [
-    "vue"
-  ],
-  "i18n-ally.localesPaths": [
-    "src/i18n/locales"
-  ],
+  "i18n-ally.enabledFrameworks": ["vue"],
+  "i18n-ally.localesPaths": ["src/i18n/locales"],
   "i18n-ally.sortKeys": false,
   "i18n-ally.keepFulfilled": false,
   "i18n-ally.keystyle": "nested",

Dockerfile.dev

@@ -6,10 +6,6 @@ WORKDIR /app
 # Install pnpm
 RUN corepack enable pnpm
 
-# Copy Web UI
-COPY src ./
-RUN pnpm install
-
 HEALTHCHECK CMD /usr/bin/timeout 5s /bin/sh -c "/usr/bin/wg show | /bin/grep -q interface || exit 1" --interval=1m --timeout=5s --retries=3
 
 # Install Linux packages
@@ -30,3 +26,11 @@ RUN update-alternatives --install /usr/sbin/ip6tables ip6tables /usr/sbin/ip6tab
 ENV DEBUG=Server,WireGuard,LowDB
 ENV PORT=51821
 ENV HOST=0.0.0.0
+
+# Install Dependencies
+COPY src/package.json src/pnpm-lock.yaml ./ ./
+RUN pnpm install
+
+# Copy Project
+COPY src ./
+

package.json

@@ -2,7 +2,7 @@
   "version": "1.0.0",
   "private": true,
   "scripts": {
-    "dev": "docker compose -f docker-compose.dev.yml up",
+    "dev": "docker compose -f docker-compose.dev.yml up --build",
     "build": "docker build -t wg-easy ."
   },
   "packageManager": "[email protected]"

src/server/database/schema.ts

@@ -1,6 +1,5 @@
 // Make sure to not use any Path Aliases in these files
 export * from './repositories/client/schema';
-export * from './repositories/general/schema';
 export * from './repositories/hooks/schema';
 export * from './repositories/interface/schema';
 export * from './repositories/metrics/schema';