From b15b63b67d8f68a9068cb7d47152c120d41f7c4f Mon Sep 17 00:00:00 2001 From: "Nikita P. Shupeyko" Date: Thu, 8 Mar 2018 21:45:16 +0300 Subject: [PATCH 1/4] Put @webyneter's first and last names in the proper order --- CONTRIBUTORS.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index 713e72cb5..f0fcec39d 100644 --- a/CONTRIBUTORS.rst +++ b/CONTRIBUTORS.rst @@ -16,7 +16,7 @@ Fábio C. Barrionuevo da Luz `@luzfcb`_ @luzfcb Saurabh Kumar `@theskumar`_ @_theskumar Jannis Gebauer `@jayfk`_ Burhan Khalid `@burhan`_ @burhan -Shupeyko Nikita `@webyneter`_ @webyneter +Nikita Shupeyko `@webyneter`_ @webyneter Bruno Alla               `@browniebroke`_ @_BrunoAlla =========================== ================ =========== From a72383a85123b2d35ce9419733c55ccba2bc846d Mon Sep 17 00:00:00 2001 From: "Nikita P. Shupeyko" Date: Thu, 8 Mar 2018 22:40:22 +0300 Subject: [PATCH 2/4] FIx WEB_CONCURRENCY environment variable missing Fixes #1562. --- {{cookiecutter.project_slug}}/.envs/.production/.django | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/.envs/.production/.django b/{{cookiecutter.project_slug}}/.envs/.production/.django index c6def565a..39bbaae44 100644 --- a/{{cookiecutter.project_slug}}/.envs/.production/.django +++ b/{{cookiecutter.project_slug}}/.envs/.production/.django @@ -30,7 +30,11 @@ DJANGO_ACCOUNT_ALLOW_REGISTRATION=True # django-compressor # ------------------------------------------------------------------------------ COMPRESS_ENABLED= -{% endif %}{% if cookiecutter.use_sentry_for_error_reporting == 'y' %} +{% endif %} +# Gunicorn +# ------------------------------------------------------------------------------ +WEB_CONCURRENCY=4 +{% if cookiecutter.use_sentry_for_error_reporting == 'y' %} # Sentry # ------------------------------------------------------------------------------ DJANGO_SENTRY_DSN= From f3dc7898e912a17c1db1556e34d66832c2c4e94b Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 9 Mar 2018 08:54:56 +0100 Subject: [PATCH 3/4] Update django-anymail from 1.4 to 2.0 (#1564) --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 351c46cef..416491674 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -24,7 +24,7 @@ Collectfast==0.6.0 # Email backends for Mailgun, Postmark, SendGrid and more # ------------------------------------------------------- -django-anymail==1.4 +django-anymail==2.0 {% if cookiecutter.use_sentry_for_error_reporting == "y" -%} # Raven is the Sentry client From e1bce92ad98a10efdb542cb811ee08a611d78db0 Mon Sep 17 00:00:00 2001 From: "Nikita P. Shupeyko" Date: Fri, 9 Mar 2018 11:40:52 +0300 Subject: [PATCH 4/4] apk add postgresql-client with django Dockerfile --- {{cookiecutter.project_slug}}/compose/local/django/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile index 383b15776..c43381092 100644 --- a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile @@ -11,7 +11,9 @@ RUN apk update \ # CFFI dependencies && apk add libffi-dev openssl-dev py-cffi \ # Translations dependencies - && apk add gettext + && apk add gettext \ + # https://docs.djangoproject.com/en/2.0/ref/django-admin/#dbshell + && apk add postgresql-client # Requirements have to be pulled and installed here, otherwise caching won't work COPY ./requirements /requirements