Skip to content
Snippets Groups Projects
Commit 8237015d authored by Jan-Hendrik Willms's avatar Jan-Hendrik Willms
Browse files

fixes #4007

Closes #4007

Merge request !2858
parent c64fdad3
No related branches found
No related tags found
No related merge requests found
...@@ -11,8 +11,6 @@ services: ...@@ -11,8 +11,6 @@ services:
MYSQL_DATABASE: studip_db MYSQL_DATABASE: studip_db
MYSQL_USER: studip_user MYSQL_USER: studip_user
MYSQL_PASSWORD: studip_password MYSQL_PASSWORD: studip_password
DEMO_DATA: 1
MAIL_TRANSPORT: debug
web: web:
build: build:
context: . context: .
...@@ -34,6 +32,7 @@ services: ...@@ -34,6 +32,7 @@ services:
MYSQL_PASSWORD: studip_password MYSQL_PASSWORD: studip_password
MYSQL_HOST: db MYSQL_HOST: db
STUDIP_MAIL_TRANSPORT: debug STUDIP_MAIL_TRANSPORT: debug
STUDIP_NAME: ${STUDIP_NAME}
# Use automigrate to migrate your instance on startup # Use automigrate to migrate your instance on startup
AUTO_MIGRATE: 1 AUTO_MIGRATE: 1
......
...@@ -28,7 +28,7 @@ done ...@@ -28,7 +28,7 @@ done
sh $STUDIP/.gitlab/scripts/install_db.sh sh $STUDIP/.gitlab/scripts/install_db.sh
if [ ! -z $AUTO_MIGRATE ]; then if [[ -n $AUTO_MIGRATE ]]; then
echo "Migrate Instance" echo "Migrate Instance"
# If migrate fails start instance anyway # If migrate fails start instance anyway
php "$STUDIP/cli/studip" migrate || true php "$STUDIP/cli/studip" migrate || true
...@@ -40,4 +40,10 @@ if [ "${1#-}" != "$1" ]; then ...@@ -40,4 +40,10 @@ if [ "${1#-}" != "$1" ]; then
set -- apache2-foreground "$@" set -- apache2-foreground "$@"
fi 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 "$@" exec "$@"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment