fix npm bug

.dockerignore

@@ -0,0 +1,14 @@
+**/node_modules
+**/dist
+**/dist-ssr
+.git
+.idea
+.vscode
+**/.env
+**/.env.*
+**/.DS_Store
+**/*.log
+docs
+pics
+icon
+no-as-a-service

.env.example

@@ -6,4 +6,5 @@ MAIL_USER=
 MAIL_PASSWORD=
 MAIL_SENDEES_CONTACT=
 MAIL_SENDEES=
-NAAS_URL=
+NAAS_URL=
+SECRET_KEY=

admin/Dockerfile

@@ -1,19 +1,26 @@
-FROM node:18 as builder
+# Build context is the repo root (npm workspaces share one root package-lock.json)
+FROM node:22-alpine AS builder
 
 WORKDIR /app
 
 COPY package.json package-lock.json ./
-RUN npm ci
+COPY frontend/package.json frontend/
+COPY admin/package.json admin/
+COPY backend/package.json backend/
+RUN npm ci -w admin
 
-COPY . .
-RUN npm run build
+ARG VITE_BACKEND_URL
+ENV VITE_BACKEND_URL=$VITE_BACKEND_URL
+
+COPY admin/ admin/
+RUN npm run build -w admin
 
 FROM nginx:alpine AS runner
 
 WORKDIR /usr/share/nginx/html
-COPY --from=builder /app/dist .
+COPY --from=builder /app/admin/dist .
 
-COPY nginx.conf /etc/nginx/conf.d/default.conf
+COPY admin/nginx.conf /etc/nginx/conf.d/default.conf
 
 EXPOSE 80
-CMD ["nginx", "-g", "daemon off;"]
+CMD ["nginx", "-g", "daemon off;"]

backend/Dockerfile

@@ -1,12 +1,17 @@
+# Build context is the repo root (npm workspaces share one root package-lock.json)
 FROM node:20-alpine
 
 ENV NODE_ENV=production
-WORKDIR /backend
+WORKDIR /app
 
-COPY package*.json ./
-RUN npm ci --omit=dev
+COPY package.json package-lock.json ./
+COPY frontend/package.json frontend/
+COPY admin/package.json admin/
+COPY backend/package.json backend/
+RUN npm ci -w backend --omit=dev
 
-COPY . .
+COPY backend/ backend/
 
+WORKDIR /app/backend
 EXPOSE 8004
-CMD ["npm", "start"]
+CMD ["npm", "start"]

backend/package.json

@@ -5,7 +5,7 @@
   "main": "server.js",
   "scripts": {
     "dev": "node --watch server.js",
-    "start": "NODE_ENV=production node server.js\""
+    "start": "NODE_ENV=production node server.js"
   },
   "keywords": [],
   "author": "",

docker-compose.yml

@@ -1,21 +1,27 @@
 services:
   usr-frontend:
     container_name: borrow-system_usr-frontend
-    build: ./frontend
-    environment:
-      VITE_BACKEND_URL: ${BACKEND_URL}
+    build:
+      context: .
+      dockerfile: frontend/Dockerfile
+      args:
+        VITE_BACKEND_URL: ${BACKEND_URL}
     restart: always
 
   admin-frontend:
     container_name: borrow-system_admin-frontend
-    build: ./admin
-    environment:
-      VITE_BACKEND_URL: ${BACKEND_URL}
+    build:
+      context: .
+      dockerfile: admin/Dockerfile
+      args:
+        VITE_BACKEND_URL: ${BACKEND_URL}
     restart: always
 
   backend:
     container_name: borrow-system_backend
-    build: ./backend
+    build:
+      context: .
+      dockerfile: backend/Dockerfile
     environment:
       NODE_ENV: production
       DB_HOST: borrow-system_mysql
@@ -29,6 +35,7 @@ services:
       MAIL_SENDEES_CONTACT: ${MAIL_SENDEES_CONTACT}
       MAIL_SENDEES: ${MAIL_SENDEES}
       NAAS_URL: ${NAAS_URL}
+      SECRET_KEY: ${SECRET_KEY}
     depends_on:
       - mysql
     restart: always

frontend/Dockerfile

@@ -1,19 +1,26 @@
+# Build context is the repo root (npm workspaces share one root package-lock.json)
 FROM node:22-alpine AS builder
 
 WORKDIR /app
 
 COPY package.json package-lock.json ./
-RUN npm ci
+COPY frontend/package.json frontend/
+COPY admin/package.json admin/
+COPY backend/package.json backend/
+RUN npm ci -w frontend
 
-COPY . .
-RUN npm run build
+ARG VITE_BACKEND_URL
+ENV VITE_BACKEND_URL=$VITE_BACKEND_URL
+
+COPY frontend/ frontend/
+RUN npm run build -w frontend
 
 FROM nginx:alpine AS runner
 
 WORKDIR /usr/share/nginx/html
-COPY --from=builder /app/dist .
+COPY --from=builder /app/frontend/dist .
 
-COPY nginx.conf /etc/nginx/conf.d/default.conf
+COPY frontend/nginx.conf /etc/nginx/conf.d/default.conf
 
 EXPOSE 80
-CMD ["nginx", "-g", "daemon off;"]
+CMD ["nginx", "-g", "daemon off;"]

mysql-timezone.cnf

@@ -0,0 +1,2 @@
+[mysqld]
+default-time-zone = Europe/Berlin