cookiecutter/cookiecutter-django
1
1
Fork 0
mirror of https://github.com/cookiecutter/cookiecutter-django.git synced 2025-08-08 14:04:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into prettify-generated-project-requirements

Browse Source
This commit is contained in:
Nikita Shupeyko 2018-03-09 12:03:36 +03:00 committed by GitHub
commit 099afc706d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTORS.rst
View File

@ -16,7 +16,7 @@ Fábio C. Barrionuevo da Luz `@luzfcb`_ @luzfcb
Saurabh Kumar `@theskumar`_ @_theskumar Saurabh Kumar `@theskumar`_ @_theskumar
Jannis Gebauer `@jayfk`_ Jannis Gebauer `@jayfk`_
Burhan Khalid `@burhan`_ @burhan Burhan Khalid `@burhan`_ @burhan
Shupeyko Nikita `@webyneter`_ @webyneter Nikita Shupeyko `@webyneter`_ @webyneter
Bruno Alla               `@browniebroke`_ @_BrunoAlla Bruno Alla               `@browniebroke`_ @_BrunoAlla
=========================== ================ =========== =========================== ================ ===========

6
{{cookiecutter.project_slug}}/.envs/.production/.django
View File

@ -30,7 +30,11 @@ DJANGO_ACCOUNT_ALLOW_REGISTRATION=True
# django-compressor # django-compressor
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
COMPRESS_ENABLED= 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 # Sentry
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
DJANGO_SENTRY_DSN= DJANGO_SENTRY_DSN=

4
{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
View File

@ -11,7 +11,9 @@ RUN apk update \
# CFFI dependencies # CFFI dependencies
&& apk add libffi-dev openssl-dev py-cffi \ && apk add libffi-dev openssl-dev py-cffi \
# Translations dependencies # 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 # Requirements have to be pulled and installed here, otherwise caching won't work
COPY ./requirements /requirements COPY ./requirements /requirements

2
{{cookiecutter.project_slug}}/requirements/production.txt
View File

@ -18,4 +18,4 @@ opbeat==3.6.1 # https://github.com/opbeat/opbeat_python
# Django # Django
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
django-storages==1.6.5 # https://github.com/jschneier/django-storages django-storages==1.6.5 # https://github.com/jschneier/django-storages
django-anymail==1.4 # https://github.com/anymail/django-anymail django-anymail==2.0 # https://github.com/anymail/django-anymail