From 56e6a53f0ae0d6dfb5c125456757582b7a60e8b1 Mon Sep 17 00:00:00 2001
From: rorapp <robert.rapp@mindboost.team>
Date: Wed, 19 Mar 2025 14:41:47 +0100
Subject: [PATCH] add backend overwrite compose file for laravel and sql

---
 apps/backend/docker-compose.overwrite.yml     |  2 +-
 apps/backend/src                              |  2 +-
 .../adminer/docker-compose.overwrite.yml      |  8 +++++
 apps/develop/adminer/docker-compose.yml       |  2 +-
 apps/frontend/src                             |  2 +-
 env/development/portainer/backend.env         | 31 +++++++++++++++++++
 scripts/setup/set-global-env.sh               |  0
 scripts/setup/set-project-root.sh             |  0
 8 files changed, 43 insertions(+), 4 deletions(-)
 create mode 100644 apps/develop/adminer/docker-compose.overwrite.yml
 create mode 100644 env/development/portainer/backend.env
 mode change 100644 => 100755 scripts/setup/set-global-env.sh
 mode change 100644 => 100755 scripts/setup/set-project-root.sh

diff --git a/apps/backend/docker-compose.overwrite.yml b/apps/backend/docker-compose.overwrite.yml
index 14203b2..26268e2 100644
--- a/apps/backend/docker-compose.overwrite.yml
+++ b/apps/backend/docker-compose.overwrite.yml
@@ -43,6 +43,6 @@ services:
 volumes:
   backend_redis_data:
     driver: local
-    name: "${INFRASTRUCTURE_LABEL}_backend_redis_data"
+    name: "${INFRASTRUCTURE_LABEL:-default}_backend_redis_data"
 
 
diff --git a/apps/backend/src b/apps/backend/src
index 623a270..56b8008 160000
--- a/apps/backend/src
+++ b/apps/backend/src
@@ -1 +1 @@
-Subproject commit 623a2709481206350acc350a3abc245efe0cad23
+Subproject commit 56b8008f8a2dce7022c8fc11ff486932b0fd651a
diff --git a/apps/develop/adminer/docker-compose.overwrite.yml b/apps/develop/adminer/docker-compose.overwrite.yml
new file mode 100644
index 0000000..b1f6dba
--- /dev/null
+++ b/apps/develop/adminer/docker-compose.overwrite.yml
@@ -0,0 +1,8 @@
+services:
+  adminer:
+          profiles: ["all", "database", "backend", "adminer", "app"]
+          image: adminer
+          container_name: ${INFRASTRUCTURE_LABEL:-default}-adminer-${ENVIRONMENT:-development}
+          restart: always
+          ports:
+              - ${ADMINER_PORT:-0}:8080
\ No newline at end of file
diff --git a/apps/develop/adminer/docker-compose.yml b/apps/develop/adminer/docker-compose.yml
index ac70ed9..9a0f146 100644
--- a/apps/develop/adminer/docker-compose.yml
+++ b/apps/develop/adminer/docker-compose.yml
@@ -12,7 +12,7 @@ services:
           labels:
               - "traefik.enable=${TRAEFIK_ENABLE:-false}"
               - "traefik.http.routers.${INFRASTRUCTURE_LABEL:-default}_adminer.entrypoints=${TRAEFIK_ENTRYPOINT:-websecure}"
-              - "traefik.http.routers.${INFRASTRUCTURE_LABEL:-default}_adminer.rule=Host(`${ADMINER_DOMAIN}`)"
+              - "traefik.http.routers.${INFRASTRUCTURE_LABEL:-default}_adminer.rule=Host(`${ADMINER_DOMAIN:-adminer.local}`)"
               - "traefik.http.routers.${INFRASTRUCTURE_LABEL:-default}_adminer.tls=true"
               - "traefik.http.routers.${INFRASTRUCTURE_LABEL:-default}_adminer.tls.certresolver=${TRAEFIK_CERT_RESOLVER:-http_resolver}"
               - 'traefik.http.routers.${INFRASTRUCTURE_LABEL:-default}_adminer.service=adminer'
diff --git a/apps/frontend/src b/apps/frontend/src
index 49027dc..078571b 160000
--- a/apps/frontend/src
+++ b/apps/frontend/src
@@ -1 +1 @@
-Subproject commit 49027dc8ea62b2895732089e0e0cf73f99668caf
+Subproject commit 078571bc57efbe503bf9af4d4d053d2288ac567d
diff --git a/env/development/portainer/backend.env b/env/development/portainer/backend.env
new file mode 100644
index 0000000..a0fcfaf
--- /dev/null
+++ b/env/development/portainer/backend.env
@@ -0,0 +1,31 @@
+
+
+# ----------------------------------
+# Redis
+# ----------------------------------
+REDIS_PASSWORD=laravel-redis-passwort
+REDIS_PORT=6379
+SERVER_IP=${SERVER_IP:-localhost}
+
+# ----------------------------------
+# Laravel Backend
+# ----------------------------------
+BACKEND_NETWORK=backend
+APP_ENV=${ENVIRONMENT-local}
+APP_NAME="mindboost backend - Compose Deployment"
+APP_URL=https://backend.local
+LARAVEL_PORT=8000
+LARAVEL_VITE_PORT=5173
+JWT_SECRET=zMtO8sgsnc4UixWSsYWE1pK9EdpNLzxNSoIPlUpTe6dDlarM3bu4cwM80tH3jA0F
+
+# ----------------------------------
+# Datenbank Zugriff - ! MUSS MIT .env.database übereinstimmen
+# ----------------------------------
+DB_HOST=database
+DB_PORT=3306
+DB_PASSWORD=1stronges-mindboostdb-passwort
+DB_USERNAME=${INFRASTRUCTURE_LABEL:-default}_${ENVIRONMENT:-development}
+DB_DATABASE=${INFRASTRUCTURE_LABEL:-default}_${ENVIRONMENT:-development}
+
+
+
diff --git a/scripts/setup/set-global-env.sh b/scripts/setup/set-global-env.sh
old mode 100644
new mode 100755
diff --git a/scripts/setup/set-project-root.sh b/scripts/setup/set-project-root.sh
old mode 100644
new mode 100755