From dd291e18e033de2e6a467b86b9ab95cca0a4093e Mon Sep 17 00:00:00 2001
From: Evili del Rio <erio@iri.upc.edu>
Date: Wed, 31 Oct 2018 11:09:19 +0100
Subject: [PATCH] .- Correct entrypoint.sh .- Add LOG_LEVEL environment
variable .- Use python 3.6 for compatibility
---
.dockerignore | 1 +
Dockerfile | 5 +++--
entrypoint.sh | 14 +++++++-------
3 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/.dockerignore b/.dockerignore
index 4a246ec..d8bab60 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,2 +1,3 @@
Dockerfile
.dockerignore
+README.md
diff --git a/Dockerfile b/Dockerfile
index c4c14b7..d7a1826 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 3f2c8d5..62b445f 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} $*
--
GitLab