From eb71aecc32968607faa41343e2363883126193be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Cohen?= Date: Sat, 6 May 2017 14:43:26 +0200 Subject: [PATCH 1/5] Optimize Django Dockerfile (#1158) --- .../compose/django/Dockerfile | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/{{cookiecutter.project_slug}}/compose/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/django/Dockerfile index 781f9b8d9..618533f7d 100644 --- a/{{cookiecutter.project_slug}}/compose/django/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/django/Dockerfile @@ -1,15 +1,16 @@ FROM python:3.5 + ENV PYTHONUNBUFFERED 1 +RUN groupadd -r django \ + && useradd -r -g django django + # Requirements have to be pulled and installed here, otherwise caching won't work COPY ./requirements /requirements +RUN pip install --no-cache-dir -r /requirements/production.txt \ + && rm -rf /requirements -RUN pip install -r /requirements/production.txt \ - && groupadd -r django \ - && useradd -r -g django django - -COPY ./compose/django/gunicorn.sh /gunicorn.sh -COPY ./compose/django/entrypoint.sh /entrypoint.sh +COPY ./compose/django/gunicorn.sh ./compose/django/entrypoint.sh / RUN sed -i 's/\r//' /entrypoint.sh \ && sed -i 's/\r//' /gunicorn.sh \ && chmod +x /entrypoint.sh \ @@ -20,6 +21,7 @@ RUN sed -i 's/\r//' /entrypoint.sh \ COPY . /app RUN chown -R django /app + USER django WORKDIR /app From 8d7fd5ea06acea5749ee3d514b814a153e84efa9 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 6 May 2017 14:48:47 +0200 Subject: [PATCH 2/5] Update django-debug-toolbar from 1.7 to 1.8 (#1156) --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 69d6ee366..00fa1b32b 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -10,7 +10,7 @@ Werkzeug==0.12.1 django-test-plus==1.0.17 factory-boy==2.8.1 -django-debug-toolbar==1.7 +django-debug-toolbar==1.8 # improved REPL ipdb==0.10.3 From 7125d5c4479f8f4c38a09d7cea1b1da3e8265a97 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sat, 6 May 2017 05:49:21 -0700 Subject: [PATCH 3/5] Update django-extensions from 1.7.8 to 1.7.9 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 00fa1b32b..23b487988 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -5,7 +5,7 @@ coverage==4.3.4 django-coverage-plugin==1.5.0 Sphinx==1.5.5 -django-extensions==1.7.8 +django-extensions==1.7.9 Werkzeug==0.12.1 django-test-plus==1.0.17 factory-boy==2.8.1 From 64dce4b7d1e027ccfef1d00a4b0252c54328a3e9 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sun, 7 May 2017 22:17:21 -0700 Subject: [PATCH 4/5] Update coverage from 4.3.4 to 4.4 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 00fa1b32b..16a77bb4a 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -1,7 +1,7 @@ # Local development dependencies go here -r base.txt -coverage==4.3.4 +coverage==4.4 django-coverage-plugin==1.5.0 Sphinx==1.5.5 From 451bee63ace469c12f2daaf99952d3415899c208 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sun, 7 May 2017 22:17:23 -0700 Subject: [PATCH 5/5] Update coverage from 4.3.4 to 4.4 --- {{cookiecutter.project_slug}}/requirements/test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/test.txt b/{{cookiecutter.project_slug}}/requirements/test.txt index 03cade464..7fdeeb4a2 100644 --- a/{{cookiecutter.project_slug}}/requirements/test.txt +++ b/{{cookiecutter.project_slug}}/requirements/test.txt @@ -7,7 +7,7 @@ psycopg2==2.7.1 {%- endif %} -coverage==4.3.4 +coverage==4.4 flake8==3.3.0 # pyup: != 2.6.0 django-test-plus==1.0.17 factory-boy==2.8.1