From ee9ed865eafc3faac8cda95384a4b74a93ae121c Mon Sep 17 00:00:00 2001
From: GotthardG <51994228+GotthardG@users.noreply.github.com>
Date: Thu, 10 Apr 2025 00:09:17 +0200
Subject: [PATCH] Refactor Docker setup and migrate to PostgreSQL

Streamlined Dockerfiles with clearer ENV variables and build args. Switched backend database from MySQL to PostgreSQL, updated configurations accordingly, and added robust Docker Compose services for better orchestration, including health checks and persistent storage.
---
 docker-compose.yml   | 4 +++-
 frontend/Dockerfile  | 2 +-
 logistics/Dockerfile | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index fda2168..739fceb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -60,7 +60,9 @@ services:
       - /app/node_modules  # ⬅️ explicit exclusion! ensures Docker-provided modules retain explicitly.
       - ./backend/ssl:/app/backend/ssl
       - ./backend/config_${ENVIRONMENT}.json:/app/backend/config_${ENVIRONMENT}.json  # Dynamically maps config based on environment
-
+    environment:
+      VITE_OPENAPI_BASE: ${VITE_OPENAPI_BASE}
+      NODE_ENV: ${NODE_ENV}
     command: sh -c "npm run start-${ENVIRONMENT} & ENVIRONMENT=${ENVIRONMENT} npm run watch:openapi"
 
   logistics_frontend:
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index 374a48f..cae1172 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -9,7 +9,7 @@ ARG VITE_SSL_KEY_PATH
 ARG VITE_SSL_CERT_PATH
 ARG NODE_ENV=development
 
-ENV VITE_OPENAPI_BASE_DEV=${VITE_OPENAPI_BASE_DEV}
+ENV VITE_OPENAPI_BASE_=${VITE_OPENAPI_BASE}
 ENV VITE_SSL_KEY_PATH=${VITE_SSL_KEY_PATH}
 ENV VITE_SSL_CERT_PATH=${VITE_SSL_CERT_PATH}
 ENV NODE_ENV=${NODE_ENV}
diff --git a/logistics/Dockerfile b/logistics/Dockerfile
index 3ecee75..1f982cb 100644
--- a/logistics/Dockerfile
+++ b/logistics/Dockerfile
@@ -8,7 +8,7 @@ ARG VITE_SSL_KEY_PATH
 ARG VITE_SSL_CERT_PATH
 ARG NODE_ENV=development
 
-ENV VITE_OPENAPI_BASE_DEV=${VITE_OPENAPI_BASE_DEV}
+ENV VITE_OPENAPI_BASE=${VITE_OPENAPI_BASE}
 ENV VITE_SSL_KEY_PATH=${VITE_SSL_KEY_PATH}
 ENV VITE_SSL_CERT_PATH=${VITE_SSL_CERT_PATH}
 ENV NODE_ENV=${NODE_ENV}