Skip to content
Snippets Groups Projects
Commit dd291e18 authored by Evili del Rio i Silvan's avatar Evili del Rio i Silvan
Browse files

.- Correct entrypoint.sh 

.- Add LOG_LEVEL environment variable
.- Use python 3.6 for compatibility
parent ec305129
No related branches found
No related tags found
No related merge requests found
Pipeline #2142 failed
Stage: build
    Stage: test
      Hide whitespace changes
      Inline Side-by-side
      .dockerignore
      + 1
      − 0
      View file @ dd291e18
      Dockerfile Dockerfile
      .dockerignore .dockerignore
      README.md
      Dockerfile
      + 3
      − 2
      View file @ dd291e18
      FROM python:alpine FROM python:3.6-alpine
      ARG django_version=1.11 ARG django_version=1.11
      ARG dev_packages="gcc g++ postgresql-dev" ARG dev_packages="gcc g++ postgresql-dev"
      ADD ./entrypoint.sh / ADD ./entrypoint.sh /
      ...@@ -15,6 +15,7 @@ RUN apk update && \ ...@@ -15,6 +15,7 @@ RUN apk update && \
      pip install "Django<=${DJANGO_VERSION}" gunicorn \ pip install "Django<=${DJANGO_VERSION}" gunicorn \
      psycopg2-binary psycopg2 mysql-connector \ psycopg2-binary psycopg2 mysql-connector \
      django-heroku whitenoise[brotli] && \ django-heroku whitenoise[brotli] && \
      apk del ${dev_packages} apk del ${dev_packages} && \
      rm -fr /root/.cache
      ENTRYPOINT [ "/entrypoint.sh" ] ENTRYPOINT [ "/entrypoint.sh" ]
      entrypoint.sh
      + 7
      − 7
      View file @ dd291e18
      ...@@ -4,6 +4,11 @@ set -x ...@@ -4,6 +4,11 @@ set -x
      git clone ${GIT_URL} . git clone ${GIT_URL} .
      pip install -r requirements.txt --no-input 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} DJANGO_SETTINGS_MODULE=${DJANGO_SETTINGS_MODULE:-$(basename ${WSGI_MODULE} .wsgi).settings}
      # Override static content # Override static content
      ...@@ -17,10 +22,5 @@ export DJANGO_SETTINGS_MODULE=settings ...@@ -17,10 +22,5 @@ export DJANGO_SETTINGS_MODULE=settings
      python manage.py collectstatic --no-input python manage.py collectstatic --no-input
      python manage.py migrate python manage.py migrate
      LOG_LEVEL=${LOG_LEVEL:-INFO}
      if [ -z "${WSGI_MODULE}" ] gunicorn --log-level=${LOG_LEVEL} ${WSGI_MODULE} $*
      then
      export WSGI_MODULE=$(basename $(dirname $(find . -name wsgi.py | head -1))).wsgi
      fi
      gunicorn --log-level=INFO ${WSGI_MODULE} $*
      0% or .
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment