diff --git a/.dockerignore b/.dockerignore index 4a246ec6c3050ae30b65f6e28a8ba022a281c91c..d8bab601bf43f05218d68311ef80dab0300797ab 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,2 +1,3 @@ Dockerfile .dockerignore +README.md diff --git a/Dockerfile b/Dockerfile index c4c14b7c89747791eee1d278b10797d6c033bebf..d7a18263c2281c4780e6f1a98d9f15bb18a9d4de 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:alpine +FROM python:3.6-alpine ARG django_version=1.11 ARG dev_packages="gcc g++ postgresql-dev" ADD ./entrypoint.sh / @@ -15,6 +15,7 @@ RUN apk update && \ pip install "Django<=${DJANGO_VERSION}" gunicorn \ psycopg2-binary psycopg2 mysql-connector \ django-heroku whitenoise[brotli] && \ - apk del ${dev_packages} + apk del ${dev_packages} && \ + rm -fr /root/.cache ENTRYPOINT [ "/entrypoint.sh" ] diff --git a/entrypoint.sh b/entrypoint.sh index 3f2c8d5903e4c640a167284b057af4e25623bb2d..62b445fa828e71e3fb2de38863b99fc100ef3571 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -4,6 +4,11 @@ set -x git clone ${GIT_URL} . pip install -r requirements.txt --no-input +if [ -z "${WSGI_MODULE}" ] +then + export WSGI_MODULE=$(basename $(dirname $(find . -name wsgi.py | head -1))).wsgi +fi + DJANGO_SETTINGS_MODULE=${DJANGO_SETTINGS_MODULE:-$(basename ${WSGI_MODULE} .wsgi).settings} # Override static content @@ -17,10 +22,5 @@ export DJANGO_SETTINGS_MODULE=settings python manage.py collectstatic --no-input python manage.py migrate - -if [ -z "${WSGI_MODULE}" ] -then - export WSGI_MODULE=$(basename $(dirname $(find . -name wsgi.py | head -1))).wsgi -fi - -gunicorn --log-level=INFO ${WSGI_MODULE} $* +LOG_LEVEL=${LOG_LEVEL:-INFO} +gunicorn --log-level=${LOG_LEVEL} ${WSGI_MODULE} $*