From 0a35ca264fd02a0303913a2f88a0cfd3477ab74c Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Tue, 30 Jun 2020 12:49:22 +0100 Subject: [PATCH] Remove some crap --- Dockerfile | 3 --- docker-entrypoint.sh | 19 ------------------- 2 files changed, 22 deletions(-) delete mode 100755 docker-entrypoint.sh diff --git a/Dockerfile b/Dockerfile index ef5f8b3..cb4a4c4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -75,8 +75,5 @@ RUN mkdir -p /code/bakerydemo/media/images && chown -R 1000:2000 /code/bakerydem # mark the destination for images as a volume VOLUME ["/code/bakerydemo/media/images/"] -# start uWSGI, using a wrapper script to allow us to easily add more commands to container startup: -ENTRYPOINT ["/code/docker-entrypoint.sh"] - # Start uWSGI CMD ["/venv/bin/uwsgi", "--show-config"] diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh deleted file mode 100755 index 971fd8b..0000000 --- a/docker-entrypoint.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh -set -e - -until psql $DATABASE_URL -c '\l'; do - >&2 echo "Postgres is unavailable - sleeping" - sleep 1 -done - ->&2 echo "Postgres is up - continuing" - -if [ "$1" = '/venv/bin/uwsgi' ]; then - /venv/bin/python manage.py migrate --noinput -fi - -if [ "x$DJANGO_LOAD_INITIAL_DATA" = 'xon' ]; then - /venv/bin/python manage.py load_initial_data -fi - -exec "$@"