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
47f788af
Commit
47f788af
authored
11 months ago
by
Jan-Hendrik Willms
Browse files
Options
Downloads
Patches
Plain Diff
refine first solution, re #3957
Merge request
studip/studip!2817
parent
c449ebf3
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
docker/studip/Dockerfile
+1
-0
1 addition, 0 deletions
docker/studip/Dockerfile
docker/studip/Dockerfile-Dev
+1
-1
1 addition, 1 deletion
docker/studip/Dockerfile-Dev
docker/studip/docker-entrypoint.sh
+6
-4
6 additions, 4 deletions
docker/studip/docker-entrypoint.sh
with
8 additions
and
5 deletions
docker/studip/Dockerfile
+
1
−
0
View file @
47f788af
...
...
@@ -59,5 +59,6 @@ COPY ./docker/studip/docker-entrypoint.sh /usr/local/bin/
RUN
chmod
u+x /usr/local/bin/docker-entrypoint.sh
# Set start parameters
ENV
AUTO_MIGRATE 1
ENTRYPOINT
["/usr/local/bin/docker-entrypoint.sh"]
CMD
["apache2-foreground"]
This diff is collapsed.
Click to expand it.
docker/studip/Dockerfile-Dev
+
1
−
1
View file @
47f788af
...
...
@@ -35,4 +35,4 @@ RUN chmod u+x /usr/local/bin/docker-entrypoint.sh
# Set start parameters
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
CMD ["apache2-foreground"]
\ No newline at end of file
CMD ["apache2-foreground"]
This diff is collapsed.
Click to expand it.
docker/studip/docker-entrypoint.sh
+
6
−
4
View file @
47f788af
...
...
@@ -28,10 +28,12 @@ done
sh
$STUDIP
/.gitlab/scripts/install_db.sh
echo
"Migrate Instance"
# If migrate fails start instance anyway
php
"
$STUDIP
/cli/studip migrate"
||
true
echo
"Migration finished"
if
[
!
-z
$AUTO_MIGRATE
]
;
then
echo
"Migrate Instance"
# If migrate fails start instance anyway
php
"
$STUDIP
/cli/studip migrate"
||
true
echo
"Migration finished"
fi
# first arg is `-f` or `--some-option`
if
[
"
${
1
#-
}
"
!=
"
$1
"
]
;
then
...
...
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