From b856b60c471710c265f96506cf2845fab9f26a8e Mon Sep 17 00:00:00 2001 From: Dmitriy Shesterkin Date: Thu, 4 May 2017 10:55:58 +0300 Subject: [PATCH] add docker entrypoint script --- bin/docker-local-entrypoint.sh | 4 ---- bin/docker-local-init.sh | 1 - bin/docker-production-entrypoint.sh | 14 ++++++++++++++ docker-compose.yml | 1 + 4 files changed, 15 insertions(+), 5 deletions(-) mode change 100644 => 100755 bin/docker-local-entrypoint.sh create mode 100755 bin/docker-production-entrypoint.sh diff --git a/bin/docker-local-entrypoint.sh b/bin/docker-local-entrypoint.sh old mode 100644 new mode 100755 index 995aa9d..3b12faa --- a/bin/docker-local-entrypoint.sh +++ b/bin/docker-local-entrypoint.sh @@ -1,9 +1,5 @@ #!/usr/bin/env bash -# Collect static files -echo "Collect static files" -python manage.py collectstatic --noinput - # Make database migrations echo "Make database migrations" python manage.py migrate makemigrations diff --git a/bin/docker-local-init.sh b/bin/docker-local-init.sh index 1b04aaa..19dbddf 100755 --- a/bin/docker-local-init.sh +++ b/bin/docker-local-init.sh @@ -2,5 +2,4 @@ make -f DockerMakefile build make -f DockerMakefile up -make -f DockerMakefile migrate make -f DockerMakefile loaddata diff --git a/bin/docker-production-entrypoint.sh b/bin/docker-production-entrypoint.sh new file mode 100755 index 0000000..995aa9d --- /dev/null +++ b/bin/docker-production-entrypoint.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +# Collect static files +echo "Collect static files" +python manage.py collectstatic --noinput + +# Make database migrations +echo "Make database migrations" +python manage.py migrate makemigrations + +# Apply database migrations +echo "Apply database migrations" +python manage.py migrate myauth +python manage.py migrate diff --git a/docker-compose.yml b/docker-compose.yml index 20abdb4..7d9aa46 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -54,6 +54,7 @@ services: command: bash -c 'python src/manage.py runserver 0.0.0.0:8000' volumes: - .:/code + entrypoint: /bin/docker-local-entrypoint.sh ports: - "8000:8000" env_file: conf/env