From b9a92ee0403aa4fe61c3224a2b77391c3b5623d3 Mon Sep 17 00:00:00 2001
From: JensForstmann <jens.git@nubsi.org>
Date: Fri, 20 Sep 2024 21:09:12 +0200
Subject: [PATCH] Update docker related files

---
 Dockerfile              | 12 ++++++------
 dev-container-init.ps1  |  2 +-
 dev-container-init.sh   |  2 +-
 dev-container-start.ps1 |  2 +-
 dev-container-start.sh  |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4d291de..f9ce317 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:20 AS BACKEND_BUILD_IMAGE
+FROM node:20 AS backend_build_image
 WORKDIR /app/backend
 COPY backend/package-lock.json .
 COPY backend/package.json .
@@ -10,7 +10,7 @@ COPY backend/tsoa.json .
 RUN npm run build
 RUN npm prune --production
 
-FROM node:20 AS FRONTEND_BUILD_IMAGE
+FROM node:20 AS frontend_build_image
 WORKDIR /app/frontend
 COPY frontend/package-lock.json .
 COPY frontend/package.json .
@@ -25,10 +25,10 @@ COPY frontend/vite.config.mts .
 RUN npm run build
 
 FROM node:20
-COPY --from=BACKEND_BUILD_IMAGE /app/backend/package.json /app/backend/swagger.json /app/backend/
-COPY --from=BACKEND_BUILD_IMAGE /app/backend/dist /app/backend/dist
-COPY --from=BACKEND_BUILD_IMAGE /app/backend/node_modules /app/backend/node_modules
-COPY --from=FRONTEND_BUILD_IMAGE /app/frontend/dist /app/frontend/dist
+COPY --from=backend_build_image /app/backend/package.json /app/backend/swagger.json /app/backend/
+COPY --from=backend_build_image /app/backend/dist /app/backend/dist
+COPY --from=backend_build_image /app/backend/node_modules /app/backend/node_modules
+COPY --from=frontend_build_image /app/frontend/dist /app/frontend/dist
 VOLUME /app/backend/storage
 EXPOSE 8080
 ARG COMMIT_SHA
diff --git a/dev-container-init.ps1 b/dev-container-init.ps1
index c7f23a1..299ade2 100644
--- a/dev-container-init.ps1
+++ b/dev-container-init.ps1
@@ -1,3 +1,3 @@
 Set-Location $PSScriptRoot
 
-docker run --rm -it -v .:/app node:20-alpine sh -c "cd /app && npm install && cd /app/backend && npm install && cd /app/frontend && npm install && mkdir -p /app/frontend/dist"
+docker run --rm -it -v .:/app node:20 sh -c "cd /app && npm install && cd /app/backend && npm install && cd /app/frontend && npm install && mkdir -p /app/frontend/dist"
diff --git a/dev-container-init.sh b/dev-container-init.sh
index ca7c0f0..bc187ee 100644
--- a/dev-container-init.sh
+++ b/dev-container-init.sh
@@ -2,4 +2,4 @@
 
 cd "$(dirname "$0")"
 
-docker run --rm -it -v .:/app node:20-alpine sh -c "cd /app && npm install && cd /app/backend && npm install && cd /app/frontend && npm install && mkdir -p /app/frontend/dist"
+docker run --rm -it -v .:/app node:20 sh -c "cd /app && npm install && cd /app/backend && npm install && cd /app/frontend && npm install && mkdir -p /app/frontend/dist"
diff --git a/dev-container-start.ps1 b/dev-container-start.ps1
index e4150d2..53f83fe 100644
--- a/dev-container-start.ps1
+++ b/dev-container-start.ps1
@@ -3,4 +3,4 @@ Set-Location $PSScriptRoot
 $TMT_PORT_BACKEND = $env:TMT_PORT_BACKEND ?? 8080
 $TMT_PORT_FRONTEND = $env:TMT_PORT_FRONTEND ?? 5173
 
-docker run --rm -it -v .:/app -p ${TMT_PORT_BACKEND}:8080 -p ${TMT_PORT_FRONTEND}:5173 node:20-alpine sh -c "cd /app/frontend && npm run dev & cd /app/backend && npm run dev"
+docker run --rm -it -v .:/app -p ${TMT_PORT_BACKEND}:8080 -p ${TMT_PORT_FRONTEND}:5173 node:20 sh -c "cd /app/frontend && npm run dev & cd /app/backend && npm run dev"
diff --git a/dev-container-start.sh b/dev-container-start.sh
index 985052f..26223b6 100644
--- a/dev-container-start.sh
+++ b/dev-container-start.sh
@@ -5,4 +5,4 @@ cd "$(dirname "$0")"
 TMT_PORT_BACKEND="${TMT_PORT_BACKEND:-8080}"
 TMT_PORT_FRONTEND="${TMT_PORT_FRONTEND:-5173}"
 
-docker run --rm -it -v .:/app -p $TMT_PORT_BACKEND:8080 -p $TMT_PORT_FRONTEND:5173 node:20-alpine sh -c "cd /app/frontend && npm run dev & cd /app/backend && npm run dev"
+docker run --rm -it -v .:/app -p $TMT_PORT_BACKEND:8080 -p $TMT_PORT_FRONTEND:5173 node:20 sh -c "cd /app/frontend && npm run dev & cd /app/backend && npm run dev"