fix node modules in staging and prod

.github/workflows/prod-client.yml

@@ -20,11 +20,11 @@ jobs:
 
     steps:
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       # login with Docker
 
-      - uses: docker/login-action@v1
+      - uses: docker/login-action@v3
         name: Login to Docker Hub
 
         with:
@@ -36,13 +36,13 @@ jobs:
 
       # prepare buildx for docker
 
-      - uses: docker/setup-buildx-action@v1
+      - uses: docker/setup-buildx-action@v3
         name: Set up Docker Buildx
 
 
       # build and push the newly created image
 
-      - uses: docker/build-push-action@v2
+      - uses: docker/build-push-action@v5
         name: Build and push
 
         with:

.github/workflows/prod-server.yml

@@ -20,12 +20,12 @@ jobs:
 
     steps:
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
 
       # login with Docker
 
-      - uses: docker/login-action@v1
+      - uses: docker/login-action@v3
         name: Login to Docker Hub
 
         with:
@@ -37,13 +37,13 @@ jobs:
 
       # prepare buildx for docker
 
-      - uses: docker/setup-buildx-action@v1
+      - uses: docker/setup-buildx-action@v3
         name: Set up Docker Buildx
 
 
       # build and push the newly created image
 
-      - uses: docker/build-push-action@v2
+      - uses: docker/build-push-action@v5
         name: Build and push
 
         with:

.github/workflows/staging-client.yml

@@ -20,11 +20,11 @@ jobs:
 
     steps:
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       # login with Docker
 
-      - uses: docker/login-action@v1
+      - uses: docker/login-action@v3
         name: Login to Docker Hub
 
         with:
@@ -36,13 +36,13 @@ jobs:
 
       # prepare buildx for docker
 
-      - uses: docker/setup-buildx-action@v1
+      - uses: docker/setup-buildx-action@v3
         name: Set up Docker Buildx
 
 
       # build and push the newly created image
 
-      - uses: docker/build-push-action@v2
+      - uses: docker/build-push-action@v5
         name: Build and push
 
         with:

.github/workflows/staging-server.yml

@@ -20,12 +20,12 @@ jobs:
 
     steps:
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
 
       # login with Docker
 
-      - uses: docker/login-action@v1
+      - uses: docker/login-action@v3
         name: Login to Docker Hub
 
         with:
@@ -37,13 +37,13 @@ jobs:
 
       # prepare buildx for docker
 
-      - uses: docker/setup-buildx-action@v1
+      - uses: docker/setup-buildx-action@v3
         name: Set up Docker Buildx
 
 
       # build and push the newly created image
 
-      - uses: docker/build-push-action@v2
+      - uses: docker/build-push-action@v5
         name: Build and push
 
         with:

client/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:18-bookworm
+FROM node:18-alpine
 
 WORKDIR /client
 
@@ -9,6 +9,4 @@ RUN npm ci
 
 COPY . .
 # Build is needed for build in github action
-RUN npm run build
-
-CMD npm run preview
+RUN npm run build

docker-compose.prod.yml

@@ -1,14 +1,12 @@
 services:
   client:
     image: dolpheus89/prod_client_pawplanner
-    command: sh -c "npm run build && npm run preview"
+    command: sh -c "npm run preview"
     restart: unless-stopped
     ports:
       - 4201:4200
     volumes:
       - web-client-build:/client/dist
-      - node_modules:/client/node_modules
-    # Fixit for HR in Windows
     environment:
       - WDS_SOCKET=127.0.0.1
       - CHOKIDAR_USEPOLLING=true
@@ -31,6 +29,7 @@ services:
       - SMTP_PASS=${SMTP_PASS}
       - NODE_ENV="production"
       - FRONTEND_URL=${FRONTEND_URL}
+      - JWTSECRETKEY=${JWTSECRETKEY}
 
   db:
     image: postgres:16
@@ -68,5 +67,4 @@ services:
 
 volumes:
   web-client-build:
-  node_modules:
   db_data:

docker-compose.staging.yml

@@ -1,14 +1,12 @@
 services:
   client:
     image: dolpheus89/staging_client_pawplanner
-    command: sh -c "npm run build && npm run preview"
+    command: sh -c "npm run preview"
     restart: unless-stopped
     ports:
       - 4200:4200
     volumes:
       - web-client-build:/client/dist
-      - node_modules:/client/node_modules
-    # Fixit for HR in Windows
     environment:
       - WDS_SOCKET=127.0.0.1
       - CHOKIDAR_USEPOLLING=true
@@ -31,6 +29,7 @@ services:
       - SMTP_PASS=${SMTP_PASS}
       - NODE_ENV="production"
       - FRONTEND_URL=${FRONTEND_URL}
+      - JWTSECRETKEY=${JWTSECRETKEY}
 
   db:
     image: postgres:16
@@ -68,5 +67,4 @@ services:
 
 volumes:
   web-client-build:
-  node_modules:
   db_data:

server/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:18-bookworm
+FROM node:18-alpine
 
 WORKDIR /server