Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Stud.IP
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Marcus Eibrink-Lunzenauer
Stud.IP
Commits
8237015d
Commit
8237015d
authored
11 months ago
by
Jan-Hendrik Willms
Browse files
Options
Downloads
Patches
Plain Diff
fixes
#4007
Closes
#4007
Merge request
!2858
parent
c64fdad3
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
docker-compose.yml
+1
-2
1 addition, 2 deletions
docker-compose.yml
docker/studip/docker-entrypoint.sh
+7
-1
7 additions, 1 deletion
docker/studip/docker-entrypoint.sh
with
8 additions
and
3 deletions
docker-compose.yml
+
1
−
2
View file @
8237015d
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
docker/studip/docker-entrypoint.sh
+
7
−
1
View file @
8237015d
...
@@ -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
"
$@
"
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment