cookiecutter/cookiecutter-django
1
1
Fork 0
mirror of https://github.com/cookiecutter/cookiecutter-django.git synced 2024-11-23 18:14:01 +03:00
Code Issues Packages Projects Releases Wiki Activity
6,884 Commits 13 Branches 582 Tags 25 MiB
d6178c775c
Commit Graph

182 Commits

Author SHA1 Message Date
Bruno Alla
9e7320ea1b Merge branch 'master' into fix_upgrade_py39 
# Conflicts:
#	README.rst
#	{{cookiecutter.project_slug}}/.gitlab-ci.yml
#	{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
#	{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
 2021-04-08 18:43:54 +01:00
Bruno Alla
e6604f9a7d Fix style 2021-04-07 21:12:36 +01:00
Bruno Alla
5a393f1d34 Merge branch 'master' into django-multi 2021-04-07 21:06:45 +01:00
Bruno Alla
c7bb4834e0 Fix pre-commit hook issues with Docker & Celery 2021-04-07 20:57:04 +01:00
Bruno Alla
c382894934 Fix pre-commit hook issues 2021-04-07 20:57:04 +01:00
Arnav Choudhury
2345c2c92d
Update {{cookiecutter.project_slug}}/compose/production/django/Dockerfile 
Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
 2021-02-24 16:26:58 +05:30
Arnav Choudhury
15453df824 Updated the local and production dockerfiles with more repeatability and easier to update in mind. 2021-02-24 10:58:28 +05:30
Bruno Alla
483b636fcb Only indent with spaces in django Dockerfile 2021-02-23 20:36:52 +00:00
Bruno Alla
ff98d8f517 Remove --use-feature=2020-resolver in pip commands 
They are now the default and cause a warning:

WARNING: --use-feature=2020-resolver no longer has any effect, since it is now the default dependency resolver in pip. This will become an error in pip 21.0.
 2021-02-23 20:34:41 +00:00
Bruno Alla
25000e1015 Merge branch 'master' into django-multi 2021-02-23 20:09:58 +00:00
areski
a1d551d067 Update from Python3.8 to Python3.9 2021-01-26 16:13:27 +01:00
Bruno Alla
8d103f3aec Merge branch 'master' into test 2021-01-24 17:06:43 +00:00
Bruno Alla
6573e63908 Merge branch 'master' into yotamtal-master 
# Conflicts:
#	CONTRIBUTORS.rst
 2020-12-10 18:59:14 +00:00
Andrew Chen Wang
72da0bfa9c
Fix docs service and add RTD support (#2920) 
Co-authored-by: Andrew-Chen-Wang <Andrew-Chen-Wang@users.noreply.github.com>
Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
 2020-11-04 17:17:02 +00:00
Arnav Choudhury
2408fc7756 Added a comment to relevant part of documentation. Also removed the unnecessary scheme key as the default value for scheme is https anyway 2020-09-18 22:14:18 +05:30
Arnav Choudhury
35b89997ef Made Traefik conf much easier to understand and improved redirect response to entrypoint as opposed to middleware layer that is hit after entrypoint and routing layers. 2020-09-17 22:22:42 +05:30
Arnav Choudhury
4a52845a26 Replaced copying python package directories with wheel files which are then used to install all requirements. This way the generated images would be a lot more stable as well. Size increases by 2-3mb though 2020-09-16 15:24:16 +05:30
Arnav Choudhury
079db28661 Changed when Requirements are copied and installed to improve incremental image build times. The extra image layer is inconsequential since python-build-stage layers are discarded anyway. 2020-09-14 01:41:33 +05:30
Arnav Choudhury
17e577c924 Fixed Typo with python build stage name that was references incorrectly in the run stage 2020-09-12 11:11:19 +05:30
Arnav Choudhury
a795086b10 Removing using python wheels to build python dependecies due to issue resolving conflicts in package sub-dependencies. Ends up being much more trouble than it's worth. 2020-09-12 11:04:08 +05:30
Arnav Choudhury
07051bff33 Fixed mistake of using production settings even for local/django image 2020-09-12 08:47:38 +05:30
Arnav Choudhury
070d4556f9 Multi stage Python build for Django 2020-09-11 22:04:44 +05:30
Arnav Choudhury
53ffbbcf2e Multi stage Python build for Django 2020-09-11 22:00:50 +05:30
Arnav Choudhury
e1922807aa Updating Traefik version from 2.0 to 2.2.11 2020-09-11 21:47:00 +05:30
Arnav Choudhury
536e86ecad
Traeffik and Django dockerfile changes (#2801) 2020-09-08 09:04:10 +01:00
Bruno Alla
8ebb464b33
Fix beat -> worker 2020-07-07 18:10:37 +01:00
Bruno Alla
8d066b3ab4 Use watchgod instead of watchdog 2020-06-29 22:46:16 +01:00
Bruno Alla
01437669a2 Merge branch 'master' into yotamtal-master 2020-06-29 22:42:54 +01:00
Bruno Alla
9af7b3ad6d Missing RUN command in Dockerfile 2020-06-29 21:52:10 +01:00
Bruno Alla
bed885f001 Comment out all lines related to LaTeX 2020-06-29 21:51:33 +01:00
Bruno Alla
196167490d Merge branch 'master' into docs 
# Conflicts:
#	{{cookiecutter.project_slug}}/requirements/local.txt
 2020-06-29 21:48:17 +01:00
Hannah Lazarus
8c2f49ad38
Update {{cookiecutter.project_slug}}/compose/local/docs/Dockerfile 
sounds good!

Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
 2020-06-27 13:57:50 -04:00
Hannah Lazarus
401ef31c6c Remove latex from sphinx docker build 
Include as helper comment only
 2020-05-18 10:33:57 -04:00
Hannah Lazarus
3152bdaeb3 Add sphinx defaults for cookiecutter'd project 
-serve, watch + live reload for docs + code file changes
-update project makefile + make.bat
-separate _source and _build
-add packages and paths to use autodoc
-edit/add documentation with examples (both at django-cookiecutter and inside generated project)
-add formatted comments in User model for pickup by Sphinx apidoc
-serve docs from a separate docs container for docker build
 2020-04-30 13:23:24 -04:00
Andrew Chen Wang
c54c4f5ef7
Fix reloading when using async 2020-04-28 16:26:34 -04:00
Sudarshan Wadkar
4021286be0
Add condition to include .co.XX TLDs 
This is best effort checking of domain names and creating the traefik
rules. These two checks should cover most of the use cases.
 2020-04-24 19:43:38 +05:30
Sudarshan Wadkar
9cf47898f4
Only consider TLDs while adding www route 
Instead of checking for `.co.XX` on best effort basis, we only check for
the single dot in the domain_name indicating no subdomain usage.
 2020-04-24 19:43:38 +05:30
Sudarshan Wadkar
cafc0ac1f3
Conditionally add www host to traefik router 
If the domain_name entered contains subdomains, e.g. `api.example.com`
then do *not* add an additional `www.api.example.com` route to traefik

If the user enters only the domain `example.com` then add the optional
`www.example.com` Host to the traefik routers.
 2020-04-24 19:43:37 +05:30
Yotam Tal
42101feef1 Add hot-reload support to celery worker 2020-04-21 13:45:30 +03:00
Bruno Alla
ca27ddd14d
Merge pull request #2524 from sorasful/master 2020-04-17 12:58:02 +01:00
Bruno Alla
c4e4bea31b Merge branch 'master' into async 2020-04-16 09:43:38 +01:00
Andrew-Chen-Wang
cc099ae941 Edited docs for local running async 2020-04-13 11:26:09 -04:00
Tevak
0df3087d3d Traefik - Also redirect wwww. to service. 2020-04-04 17:26:24 +02:00
Ernesto Cedeno
0cdf60ceac Change Python version to 3.8 2020-03-29 19:55:27 +02:00
Andrew-Chen-Wang
367225e4e8 Removed the 4 workers from the production start of uvicorn 2020-03-24 21:46:40 -04:00
Andrew-Chen-Wang
125ffec243 Changed starting commands for running server 
* Performance is very low
 2020-03-24 20:51:43 -04:00
Andrew-Chen-Wang
aee2de347b Add uvicorn and web sockets for Django 3 
* Add use_async option to cookiecutter.json
* Add websocket configuration
 2020-03-24 15:40:14 -04:00
Bruno Alla
ca7fcb8f62
Merge pull request #2442 from jameswilliams1/fix-django-compressor-settings 
Fix broken Django Compressor setup and enable static files minification
 2020-03-16 19:53:02 +00:00
Agustin Scaramuzza
7e345d5fb3 Add PYTHONDONTWRITEBYTECODE flag to local development Dockerfile 2020-03-11 14:41:37 -03:00
James Williams
d3db7a867f
fix compresss offline never runs using environ 2020-02-28 17:04:15 +00:00
James Williams
89f85f1255
- configure compressor when not using s3 
- update django start script to compress if using whitenoise and compress enabled

- add to contributors.rst
 2020-02-28 15:59:14 +00:00
Demetris Stavrou
1a7bcccd94 Added celery cookiecutter condition in Traefik configuration 2020-02-18 11:01:56 +02:00
Demetris Stavrou
86c9b3cb28 Flower now served by Traefik 2020-02-04 15:04:47 +02:00
Bruno Alla
a0ad9b82b4
Replaced Docker python:3.7-alpine image with python:3.7-slim-bu… (#2391) 
Replaced Docker python:3.7-alpine image with python:3.7-slim-buster
 2020-01-11 16:46:09 +00:00
Bruno Alla
5d0b0a7fe3
Upgrade to Traefik v2 (#2338) 
Upgrade to Traefik v2
 2020-01-11 14:18:30 +00:00
Trung Dong Huynh
4a71b0b936 Using the python:3.7-slim-buster image for later Python version - 3.7.6 
(instead of debian:buster-slim, shipped with Python 3.7.3)
 2020-01-07 13:54:15 +00:00
Trung Dong Huynh
b22045bcd4 Replaced base Docker image with debian:buster-slim (#2373) 
Using system Python 3 distribution (3.7.3) in order to allow the use of Debian packages for numpy, scipy, etc. without the need of building them or installing build dependencies.

Changed `#!/bin/sh` in shell scripts to `#!/bin/bash` to make `set -o pipefail` work.
 2020-01-07 11:06:31 +00:00
Yuchen Xie
a88b6b04b6 Speed up django image build process, and reduce its size 2019-12-09 09:55:37 +08:00
Denis Savran
c76b3066d6 Upgrade to Traefik v2 2019-11-29 21:35:40 +03:00
Bruno Alla
5e196b45e9
Pin Traefik Docker image to v1 
Until we do the required changes to update to v2.

Fixes #2258
 2019-10-10 11:36:48 +01:00
Nicolas Stefani
7d0f8606ed Update python image to 3.7 2019-09-29 09:41:13 -03:00
Tim Claessens
9b48f922ed Remove all end-of-line carriage returns and not just the first occurrence 2019-06-19 09:46:10 +02:00
Matt Knapper
98012829f3 storageFile is deprecated, use storage instead 2019-05-18 10:10:45 -04:00
Bruno Alla
b039e24130
Refactor Celery integration according to current best practices (#2016) 
Refactor Celery integration according to current best practices
 2019-05-17 21:38:00 +01:00
Bruno Alla
895298c28f Refactor Celery integration according to current best practices 
- Change celery app to not be a Django app, more like a WSGI app
- Define a Celery task in the Django users app
- Write a test to execute the task
- Update scripts to use the new app to start workers
- Update documentation

Fix #865
 2019-04-02 15:40:32 +01:00
Jelmert
8851ac13ef Added the awscli container for uploading and downloading backups from and to Amazon S3 2019-04-02 15:36:44 +02:00
Bruno Alla
b91c70d755
Add a node image to run Gulp when selecting it with Docker (#1687) 
## Description

Following up on @webyneter attempt in #1205, which is now getting outdated, I've tried to make Gulp task runner work with Docker. There is no documentation yet, but this seems to work locally with the custom bootstrap compilation...

- [x] Add a node image for local developement
- [x] Proxy the django image rather than localhost in Browser sync, pass header to keep hostname
- [x] Don't call the runserver command from Gulp, let docker-compose handle
- [x] Update package.json & gulpfile.js templates to reduce the number of unwanted empty lines
- [x] Use [multi-stage build](https://docs.docker.com/develop/develop-images/multistage-build/) in production to make sure the static assets are produced
- [x] Update documentation
- [x] Verify that the previous issue with static assets missing from production isn't there 

## Rationale

Currently, the static build isn't working nicely with Docker, extra manual setup is required.

Fixes #1762
 2019-03-25 12:10:55 +00:00
Demetris
b312d516a4 Replace Caddy with Traefik (#1714) 
## Description

Replace Caddy with Traefik

## Rationale

There is some trouble with the Caddy license (https://github.com/pydanny/cookiecutter-django/pull/1282#issuecomment-329617536) 

@drdaeman suggested using Traefik (https://github.com/pydanny/cookiecutter-django/pull/1282#issuecomment-353655273) which supports ACME and also plays very nice with Docker.

## Comments

I am currently using the proposed setup on a live site and it working great so far. If this PR is of interest to the maintainers, then I could commit more changes and take care of the documentation. Of course, any suggestions by the more experienced people around here, are welcome!
 2019-03-19 09:32:45 +00:00
Bruno Alla
ae27ef3fae Merge branch 'master' into conditional-redis-merge 2019-03-11 20:53:36 +00:00
HP Bruna
03e5670c25
CSRF in header 
CSRF header is needed for a POST request in the Django REST framework.
 2018-11-07 21:54:52 +01:00
Chris Pappalardo
ea53635a0a fixed production bugs in caddyfile and middleware 2018-09-15 12:45:10 -07:00
Demetris Stavrou
2c56b2e0e3 Added CELERY_BROKER_URL back to entrypoint and surrounded it with a conditional 2018-06-28 00:30:23 +03:00
Demetris Stavrou
7c69704f9f Moved CELERY_BROKER_URL definition to .django env file to resolve error when Celery is not used (PR #1693) 2018-06-28 00:30:23 +03:00
Nikita Shupeyko
275c13292c
Integrate Flower with Docker Compose setup (#1655) 
* Integrate Flower with Docker Compose setup locally

* Remove alien worker celeryd option

* Move Flower COPY section below the worker's

* Remove set -o pipefail command from Flower start script

* Flower client authentication

* Override flower service image name

* Move flower service to the end of local.yml

* Install flower==0.9.2 in all environments

* Introduce production flower service

* Fix local flower start script

* Document Flower integration

* Prettify *.django envs

Rationale: consistency.

* Reference local environment Flower docs from the production's

* 'two more services' -> 'three more services'
 2018-06-27 19:33:21 +03:00
Nikita P. Shupeyko
d8526d1b2d Unset -o xtrace in compose start scripts 2018-06-05 12:28:11 +03:00
Nikita P. Shupeyko
b8c7ae8b4b Remove set -o pipefail command from celerybeat start script 2018-05-28 12:50:57 +03:00
Nikita P. Shupeyko
e08b6ab6f8 Remove set -o pipefail command from celeryworker start script 2018-05-28 12:50:54 +03:00
Nikita P. Shupeyko
77f61de236 chown django /start-(celerybeat|celeryworker) in production Django 2018-05-25 12:55:27 +03:00
Michel Sassano
c3b9f72f31 Remove openssl to fix unsatisfiable constraints error with libressl (#1661) 
Removed the openssl-dev package from the Django Dockerfiles (local and production) to fix the unsatisfiable constraints error.

The error appears because you can't have openssl and libressl installed at the same time. One of the package used by the template/project installs libressl which create an error when trying to install openssl.

Thx to @browniebroke
 2018-05-25 14:21:22 +08:00
Nikita P. Shupeyko
39c825a262 Fix latest Caddy version 2018-05-21 22:36:50 +03:00
Nikita P. Shupeyko
6cefe2b9dc Rename gunicorn script to start 2018-05-21 22:28:18 +03:00
Nikita P. Shupeyko
4a1ea2fb45 Commit local django start scripts back 2018-05-21 15:39:12 +03:00
Nikita P. Shupeyko
cfff5b9d08 Commit local django celery start scripts back 2018-05-21 15:34:28 +03:00
Nikita P. Shupeyko
849f64e1a5 Remove .sh ext from executable scripts 2018-05-21 15:20:11 +03:00
Nikita P. Shupeyko
90953a83f2 Alter django entrypoint.sh output 2018-05-21 15:03:37 +03:00
Nikita P. Shupeyko
9b938647b4 Refactor exec "$@" in django entrypoint.sh 2018-05-21 14:59:26 +03:00
Nikita Shupeyko
820e3540da
Upgrade Caddy to 0.11 and pin its version to minor rather than patch (#1653) 2018-05-21 12:44:38 +03:00
Nikita P. Shupeyko
091a3b6d0f gunicorn --bind instead of gunicorn -b 2018-05-14 10:20:27 +03:00
Nikita P. Shupeyko
17739ff263 Refactor POSTGRES_PORT env 2018-05-09 12:58:37 +03:00
Nikita P. Shupeyko
906299ae39 Refactor POSTGRES_HOST env 2018-05-09 12:58:33 +03:00
Nikita Shupeyko
b4d0416530
Fix PostgreSQL backup restore (#1628) 
* Export PG* envs when backing up postgres

* Export PG* envs when restoring postgres from backup

* Prevent postgres connection from dropping all at ones

* Alter postgres backups docs  

Include another crucial prerequisite.

* "feel free switching" -> "feel free to switch"

* Address the feedback
 2018-05-05 12:27:27 +03:00
Nikita P. Shupeyko
26ccf9307f Fix REDIS_URL missing 
Fixes #1570.
 2018-04-04 13:42:01 +03:00
Nikita P. Shupeyko
2fa5adc2b0 Designate 'postgres' as a variable in entrypoint.sh 
Rationale: clarity.
 2018-04-04 11:43:39 +03:00
Nikita P. Shupeyko
897d54b690 Alter Dockerfile comment url to point at dev Django 2018-04-04 11:16:11 +03:00
Nikita Shupeyko
59cd5b4849
Celery code blocks are still generated even though Celery is not opted out for (#1587) 
* Celery jinja condition in .gitignore

* Celery jinja conditions in Django Dockerfiles

* Re-phrase Django Dockerfile requirements comments

* Remove celery compose dirs through post_gen_project.py
 2018-03-27 18:40:44 +03:00
Nikita Shupeyko
bcd0a8c46e
Fix & improve PostgreSQL backup/restore scripts (#1571) 
* Fix & imporve postgres backup/restore scripts

* Update PostgreSQL backup/restore docs

* Fix postgres Dockerfile regression

* Extend error messages in PostgreSQL maintenance scipts
 2018-03-14 13:44:16 +03:00
Nikita P. Shupeyko
e1bce92ad9 apk add postgresql-client with django Dockerfile 2018-03-09 11:41:02 +03:00
Nikita P. Shupeyko
03ee6c78d6 Fix CELERY_BROKER_URL overriden in entrypoint.sh 
Closes #1235.
 2018-03-08 19:04:10 +03:00
Nikita P. Shupeyko
5543359382 Distinguish between POSTGRES_DB and POSTGRES_USER 
Closes #1301.
 2018-03-08 19:04:10 +03:00
Nikita P. Shupeyko
5261956356 Refactor gunicorn -w to be set from WEB_CONCURRENCY env 
Closes #1480.
 2018-03-05 14:26:43 +03:00