diff --git a/docker/studip/Dockerfile b/docker/studip/Dockerfile index 8ee1d204c075a309747b99453d98b00f91a8250b..bc65e81719ed8b088c635183691606e0cc6314f0 100644 --- a/docker/studip/Dockerfile +++ b/docker/studip/Dockerfile @@ -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"] diff --git a/docker/studip/Dockerfile-Dev b/docker/studip/Dockerfile-Dev index 960bd97f8cc845f234e2e8b30a3ebaea0380e114..1549fdbb3d6c74baee417682df14bd9435ffe8c3 100644 --- a/docker/studip/Dockerfile-Dev +++ b/docker/studip/Dockerfile-Dev @@ -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"] diff --git a/docker/studip/docker-entrypoint.sh b/docker/studip/docker-entrypoint.sh index e7bb00f589caa4e17dd628a517430d695a4658a1..ccd0ef3441efe55a5946b71de7c05bff3078b4ae 100644 --- a/docker/studip/docker-entrypoint.sh +++ b/docker/studip/docker-entrypoint.sh @@ -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