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

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
...@@ -59,5 +59,6 @@ COPY ./docker/studip/docker-entrypoint.sh /usr/local/bin/ ...@@ -59,5 +59,6 @@ COPY ./docker/studip/docker-entrypoint.sh /usr/local/bin/
RUN chmod u+x /usr/local/bin/docker-entrypoint.sh RUN chmod u+x /usr/local/bin/docker-entrypoint.sh
# Set start parameters # Set start parameters
ENV AUTO_MIGRATE 1
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"] ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
CMD ["apache2-foreground"] CMD ["apache2-foreground"]
...@@ -35,4 +35,4 @@ RUN chmod u+x /usr/local/bin/docker-entrypoint.sh ...@@ -35,4 +35,4 @@ RUN chmod u+x /usr/local/bin/docker-entrypoint.sh
# Set start parameters # Set start parameters
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"] ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
CMD ["apache2-foreground"] CMD ["apache2-foreground"]
\ No newline at end of file
...@@ -28,10 +28,12 @@ done ...@@ -28,10 +28,12 @@ done
sh $STUDIP/.gitlab/scripts/install_db.sh sh $STUDIP/.gitlab/scripts/install_db.sh
echo "Migrate Instance" if [ ! -z $AUTO_MIGRATE ]; then
# If migrate fails start instance anyway echo "Migrate Instance"
php "$STUDIP/cli/studip migrate" || true # If migrate fails start instance anyway
echo "Migration finished" php "$STUDIP/cli/studip migrate" || true
echo "Migration finished"
fi
# first arg is `-f` or `--some-option` # first arg is `-f` or `--some-option`
if [ "${1#-}" != "$1" ]; then if [ "${1#-}" != "$1" ]; then
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment