diff --git a/.gitignore b/.gitignore index 5cf8a77ff94f1e17b16de9f744390a53430a1648..61228f1f1878cc5e7103c4c491bf97302e8b513c 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,4 @@ docker-entrypoint.lock celerybeat-schedule.bak celerybeat-schedule.dat celerybeat-schedule.dir -docker-django.env.prod \ No newline at end of file +docker-django.env.prodnetworks.zip diff --git a/data/.gitignore b/data/.gitignore index 6f8cd6338cce6b214cdbe5a3677699e24a5707cf..ae48e51d88acadddbf79015cf95414cd3e379b9c 100644 --- a/data/.gitignore +++ b/data/.gitignore @@ -1 +1,2 @@ data.zip +networks.zip diff --git a/scripts/docker-entrypoint.sh b/scripts/docker-entrypoint.sh index ffdd55242e480af42f4e3533ecad1b266cd96a66..0dd02269e369dcd54822f21c539cd3a36cc755c4 100755 --- a/scripts/docker-entrypoint.sh +++ b/scripts/docker-entrypoint.sh @@ -1,19 +1,10 @@ #!/bin/bash -file="store/docker-entrypoint.lock" -# exit if entrypoint.lock exists to prevent new import of data every time docker is restarted - - - -#if ! test -f "$file"; then -# sh scripts/import-data.sh - python3 manage.py makemigrations drugstone - python3 manage.py migrate - python3 manage.py createfixtures - python3 manage.py cleanuptasks - python3 manage.py populate_db --all --update - python3 manage.py make_graphs -# touch $file -#fi +python3 manage.py makemigrations drugstone +python3 manage.py migrate +python3 manage.py createfixtures +python3 manage.py cleanuptasks +python3 manage.py populate_db --all --update +python3 manage.py make_graphs /usr/bin/supervisord -c "/etc/supervisor/conf.d/supervisord.conf"