From 35a753d2444c864acd4f7812b7fa93076b8b5f50 Mon Sep 17 00:00:00 2001 From: pedro Date: Tue, 11 Feb 2025 16:15:49 +0100 Subject: [PATCH] docker: better devicehub entrypoint --- .dockerignore | 1 + docker/devicehub-django.entrypoint.sh | 11 ++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.dockerignore b/.dockerignore index 9bdf429..541362d 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,2 +1,3 @@ db .git +already_configured diff --git a/docker/devicehub-django.entrypoint.sh b/docker/devicehub-django.entrypoint.sh index 318435f..a027b63 100644 --- a/docker/devicehub-django.entrypoint.sh +++ b/docker/devicehub-django.entrypoint.sh @@ -200,9 +200,11 @@ check_app_is_there() { } deploy() { - # TODO this is weird, find better workaround - git config --global --add safe.directory "${program_dir}" - export COMMIT=$(git log --format="%H %ad" --date=iso -n 1) + if [ -d /opt/devicehub-django/.git ]; then + # TODO this is weird, find better workaround + git config --global --add safe.directory "${program_dir}" + export COMMIT=$(git log --format="%H %ad" --date=iso -n 1) + fi if [ "${DEBUG:-}" = 'true' ]; then ./manage.py print_settings @@ -218,6 +220,9 @@ deploy() { # move the migrate thing in docker entrypoint # inspired by https://medium.com/analytics-vidhya/django-with-docker-and-docker-compose-python-part-2-8415976470cc echo "INFO detected NEW deployment" + if [ ! -d "${program_dir}/db/" ]; then + mkdir -p "${program_dir}/db/" + fi ./manage.py migrate config_phase fi