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

Merge branch 'master' of github.com:pydanny/cookiecutter-django

Browse Source
This commit is contained in:
Arnav Choudhury 2020-09-09 10:22:54 +05:30
commit 7e765c3b3d
11 changed files with 70 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.github/contributors.json vendored
View File

@ -1027,5 +1027,15 @@
"name": "Corey Garvey",
"github_login": "coreygarvey",
"twitter_username": ""
},
{
"name": "Arnav Choudhury",
"github_login": "arnav13081994",
"twitter_username": ""
},
{
"name": "Wes Turner",
"github_login": "westurner",
"twitter_username": "westurner"
}
]

18
CHANGELOG.md
View File

@ -3,6 +3,24 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
<!-- GENERATOR_PLACEHOLDER -->
## [2020-09-08]
### Changed
- Traeffik and Django dockerfile changes ([#2801](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2801))
## [2020-09-07]
### Changed
- Add :z/:Z to mounted volumes in {local,production}.yml ([#2663](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2663))
- Remove --no-binary option for psycopg2 ([#2798](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2798))
- Updated Gitlab CI to use Python 3.8 instead of Python 3.7 ([#2794](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2794))
### Fixed
- Fix options for sphinx-autobuild in docs Makefile ([#2799](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2799))
### Updated
- Update psycopg2-binary to 2.8.6 ([#2797](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2797))
## [2020-09-05]
### Updated
- Auto-update pre-commit hooks ([#2793](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2793))
## [2020-09-04]
### Updated
- Update django-extensions to 3.0.8 ([#2792](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2792))

14
CONTRIBUTORS.md
View File

@ -264,6 +264,13 @@ Listed in alphabetical order.
</td>
<td></td>
</tr>
<tr>
<td>Arnav Choudhury</td>
<td>
<a href="https://github.com/arnav13081994">arnav13081994</a>
</td>
<td></td>
</tr>
<tr>
<td>AsheKR</td>
<td>
@ -1419,6 +1426,13 @@ Listed in alphabetical order.
</td>
<td></td>
</tr>
<tr>
<td>Wes Turner</td>
<td>
<a href="https://github.com/westurner">westurner</a>
</td>
<td>westurner</td>
</tr>
<tr>
<td>Will Farley</td>
<td>

2
{{cookiecutter.project_slug}}/.pre-commit-config.yaml
View File

@ -16,7 +16,7 @@ repos:
- id: black
- repo: https://github.com/timothycrosley/isort
rev: 5.5.0
rev: 5.5.1
hooks:
- id: isort

16
{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
View File

@ -32,26 +32,26 @@ COPY ./requirements /requirements
RUN pip install --no-cache-dir -r /requirements/production.txt \
&& rm -rf /requirements
COPY ./compose/production/django/entrypoint /entrypoint
COPY --chown=django:django ./compose/production/django/entrypoint /entrypoint
RUN sed -i 's/\r$//g' /entrypoint
RUN chmod +x /entrypoint
RUN chown django /entrypoint
COPY ./compose/production/django/start /start
COPY --chown=django:django ./compose/production/django/start /start
RUN sed -i 's/\r$//g' /start
RUN chmod +x /start
RUN chown django /start
{%- if cookiecutter.use_celery == "y" %}
COPY ./compose/production/django/celery/worker/start /start-celeryworker
COPY --chown=django:django ./compose/production/django/celery/worker/start /start-celeryworker
RUN sed -i 's/\r$//g' /start-celeryworker
RUN chmod +x /start-celeryworker
RUN chown django /start-celeryworker
COPY ./compose/production/django/celery/beat/start /start-celerybeat
COPY --chown=django:django ./compose/production/django/celery/beat/start /start-celerybeat
RUN sed -i 's/\r$//g' /start-celerybeat
RUN chmod +x /start-celerybeat
RUN chown django /start-celerybeat
COPY ./compose/production/django/celery/flower/start /start-flower
RUN sed -i 's/\r$//g' /start-flower

6
{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile
View File

@ -1,5 +1,5 @@
FROM traefik:v2.0
RUN mkdir -p /etc/traefik/acme
RUN touch /etc/traefik/acme/acme.json
RUN chmod 600 /etc/traefik/acme/acme.json
RUN mkdir -p /etc/traefik/acme \
&& touch /etc/traefik/acme/acme.json \
&& chmod 600 /etc/traefik/acme/acme.json
COPY ./compose/production/traefik/traefik.yml /etc/traefik

4
{{cookiecutter.project_slug}}/docs/Makefile
View File

@ -22,9 +22,9 @@ help:
# Build, watch and serve docs with live reload
livehtml:
sphinx-autobuild -b html
{%- if cookiecutter.use_docker == 'y' %} -H 0.0.0.0
{%- if cookiecutter.use_docker == 'y' %} --host 0.0.0.0
{%- else %} --open-browser
{%- endif %} -p 7000 --watch $(APP) -c . $(SOURCEDIR) $(BUILDDIR)/html
{%- endif %} --port 7000 --watch $(APP) -c . $(SOURCEDIR) $(BUILDDIR)/html
# Outputs rst files from django application code
apidocs:

14
{{cookiecutter.project_slug}}/local.yml
View File

@ -17,7 +17,7 @@ services:
- mailhog
{%- endif %}
volumes:
- .:/app
- .:/app:z
env_file:
- ./.envs/.local/.django
- ./.envs/.local/.postgres
@ -32,8 +32,8 @@ services:
image: {{ cookiecutter.project_slug }}_production_postgres
container_name: postgres
volumes:
- local_postgres_data:/var/lib/postgresql/data
- local_postgres_data_backups:/backups
- local_postgres_data:/var/lib/postgresql/data:Z
- local_postgres_data_backups:/backups:z
env_file:
- ./.envs/.local/.postgres
@ -46,9 +46,9 @@ services:
env_file:
- ./.envs/.local/.django
volumes:
- ./docs:/docs
- ./config:/app/config
- ./{{ cookiecutter.project_slug }}:/app/{{ cookiecutter.project_slug }}
- ./docs:/docs:z
- ./config:/app/config:z
- ./{{ cookiecutter.project_slug }}:/app/{{ cookiecutter.project_slug }}:z
ports:
- "7000:7000"
@ -113,7 +113,7 @@ services:
depends_on:
- django
volumes:
- .:/app
- .:/app:z
# http://jdlm.info/articles/2016/03/06/lessons-building-node-app-docker.html
- /app/node_modules
command: npm run dev

8
{{cookiecutter.project_slug}}/production.yml
View File

@ -25,8 +25,8 @@ services:
dockerfile: ./compose/production/postgres/Dockerfile
image: {{ cookiecutter.project_slug }}_production_postgres
volumes:
- production_postgres_data:/var/lib/postgresql/data
- production_postgres_data_backups:/backups
- production_postgres_data:/var/lib/postgresql/data:Z
- production_postgres_data_backups:/backups:z
env_file:
- ./.envs/.production/.postgres
@ -38,7 +38,7 @@ services:
depends_on:
- django
volumes:
- production_traefik:/etc/traefik/acme
- production_traefik:/etc/traefik/acme:z
ports:
- "0.0.0.0:80:80"
- "0.0.0.0:443:443"
@ -75,5 +75,5 @@ services:
env_file:
- ./.envs/.production/.django
volumes:
- production_postgres_data_backups:/backups
- production_postgres_data_backups:/backups:z
{%- endif %}

4
{{cookiecutter.project_slug}}/requirements/local.txt
View File

@ -3,9 +3,9 @@
Werkzeug==1.0.1 # https://github.com/pallets/werkzeug
ipdb==0.13.3 # https://github.com/gotcha/ipdb
{%- if cookiecutter.use_docker == 'y' %}
psycopg2==2.8.5 --no-binary psycopg2 # https://github.com/psycopg/psycopg2
psycopg2==2.8.6 # https://github.com/psycopg/psycopg2
{%- else %}
psycopg2-binary==2.8.5 # https://github.com/psycopg/psycopg2
psycopg2-binary==2.8.6 # https://github.com/psycopg/psycopg2
{%- endif %}
{%- if cookiecutter.use_async == 'y' %}
watchgod==0.6 # https://github.com/samuelcolvin/watchgod

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

@ -3,7 +3,7 @@
-r base.txt
gunicorn==20.0.4 # https://github.com/benoitc/gunicorn
psycopg2==2.8.5 --no-binary psycopg2 # https://github.com/psycopg/psycopg2
psycopg2==2.8.6 # https://github.com/psycopg/psycopg2
{%- if cookiecutter.use_whitenoise == 'n' %}
Collectfast==2.2.0 # https://github.com/antonagestam/collectfast
{%- endif %}