diff options
| author | Jan-Hendrik Willms <tleilax+studip@gmail.com> | 2024-04-05 12:16:30 +0000 |
|---|---|---|
| committer | Jan-Hendrik Willms <tleilax+studip@gmail.com> | 2024-04-05 12:16:30 +0000 |
| commit | 47f788af78eaf5bd6245341decfbbffe6c43f621 (patch) | |
| tree | 9196dd77907eb56db83ebf77c0e26b06e06a7937 /docker | |
| parent | c449ebf329f2a2b645a783965529739c61fe5152 (diff) | |
refine first solution, re #3957
Merge request studip/studip!2817
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/studip/Dockerfile | 1 | ||||
| -rw-r--r-- | docker/studip/Dockerfile-Dev | 2 | ||||
| -rw-r--r-- | docker/studip/docker-entrypoint.sh | 10 |
3 files changed, 8 insertions, 5 deletions
diff --git a/docker/studip/Dockerfile b/docker/studip/Dockerfile index 8ee1d20..bc65e81 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 960bd97..1549fdb 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 e7bb00f..ccd0ef3 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 |