From 8237015debcd53cfecd6c38750f52c0de36d4acf Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Fri, 12 Apr 2024 13:53:19 +0000
Subject: [PATCH] fixes #4007
Closes #4007
Merge request studip/studip!2858
---
docker-compose.yml | 3 +--
docker/studip/docker-entrypoint.sh | 8 +++++++-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index 492671dbb0b..8a2f0101958 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,8 +11,6 @@ services:
MYSQL_DATABASE: studip_db
MYSQL_USER: studip_user
MYSQL_PASSWORD: studip_password
- DEMO_DATA: 1
- MAIL_TRANSPORT: debug
web:
build:
context: .
@@ -34,6 +32,7 @@ services:
MYSQL_PASSWORD: studip_password
MYSQL_HOST: db
STUDIP_MAIL_TRANSPORT: debug
+ STUDIP_NAME: ${STUDIP_NAME}
# Use automigrate to migrate your instance on startup
AUTO_MIGRATE: 1
diff --git a/docker/studip/docker-entrypoint.sh b/docker/studip/docker-entrypoint.sh
index 111d35761c1..dde57c5d6e9 100644
--- a/docker/studip/docker-entrypoint.sh
+++ b/docker/studip/docker-entrypoint.sh
@@ -28,7 +28,7 @@ done
sh $STUDIP/.gitlab/scripts/install_db.sh
-if [ ! -z $AUTO_MIGRATE ]; then
+if [[ -n $AUTO_MIGRATE ]]; then
echo "Migrate Instance"
# If migrate fails start instance anyway
php "$STUDIP/cli/studip" migrate || true
@@ -40,4 +40,10 @@ if [ "${1#-}" != "$1" ]; then
set -- apache2-foreground "$@"
fi
+# Set name of installation if set
+if [[ -n "$STUDIP_NAME" ]]; then
+ echo "Setting installation name"
+ php "$STUDIP/cli/studip" config:set UNI_NAME_CLEAN "$STUDIP_NAME"
+fi
+
exec "$@"
--
GitLab