Commit Graph

28 Commits

Author SHA1 Message Date
Andrew-Chen-Wang
391874b426 Add Redis 6 support 2021-07-05 16:37:35 -04:00
Fábio C. Barrionuevo da Luz
c6d53d753a Revert "Fix Celery ports error on local Docker (#3241)"
This reverts commit d8b39f32ae.
2021-06-28 09:02:16 -03:00
Haseeb ur Rehman
d8b39f32ae
Fix Celery ports error on local Docker (#3241) 2021-06-28 11:30:30 +01:00
Bruno Alla
c382894934 Fix pre-commit hook issues 2021-04-07 20:57:04 +01: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
Wes Turner
624dd94dd3
Add :z/:Z to mounted volumes in {local,production}.yml (#2663) 2020-09-07 13:51:52 +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
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
Hannah Lazarus
f9c20af456 Add container_names for docker commands
container_names make it possible to run docker commands
without looking up container hash
use in dev.yml
2020-04-24 16:31:20 -04:00
Bruno Alla
642c28792c Update Redis version to 5.0 2019-05-18 13:54:25 +01: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
Nikita P. Shupeyko
3ac9902670 Rename project template Docker Compose volumes
Rationale: consistent image, volume etc. naming conventions
2018-06-27 19:52:06 +03:00
Nikita P. Shupeyko
0a9c0cb06a Upgrade Docker Compose project template configs to version 3 2018-06-27 19:45:36 +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
7d7eb78773 Remove duplicate Docker Compose service configuration
Rationale: those sections will always be there thanks to inheritance
2018-06-09 14:59:30 +03:00
Nikita P. Shupeyko
849f64e1a5 Remove .sh ext from executable scripts 2018-05-21 15:20:11 +03:00
Nikita Shupeyko
4944907fb5
Upgrade redis service to 3.2 (#1631) 2018-05-05 01:30:57 +03:00
Nikita P. Shupeyko
ae9dc2e782 Distinguish between local and production compose services
Rationale: 
1. building production stack on the same machine with local doesn't lead to conflicts anymore;
2. production and local service images are now clearly distinguished by name.
2018-04-04 13:38:57 +03:00
Nikita P. Shupeyko
34673ff686 Merge .celery envs file with .django
Rationale: workflow simplification.
2018-04-04 10:52:16 +03:00
Nikita P. Shupeyko
bf089fd2b6 Fix celery services exit with status code 2
Fixes #1588.
2018-03-28 18:18:26 +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 Shupeyko
3f8aa26d0f
Group environment variables by the corresponding directories (#1295)
* Update generated project's .gitignore

* Post-gen gitignore .env/ and .env

* Fix linesep between gitignored entries

* Persist `.env/**/*` files into cookiecutter-django's VCS

* Rename .env/ to .envs/

* Reference the newly created .envs/**/.* files in local.yml

* Reference the newly created .envs/**/.* files in production.yml

* Delete .env.example

* Refactor post-gen-project.py

Closes #1299.

* Implement production-dotenv-files-to-dotenv-file merge script

* Create shared PyCharm Run Configuration for the automation script

* Randomize POSTGRES_PASSWORD in ./envs/(.local|.production)/.postgres

* Default POSTGRES_PASSWORD and POSTGRES_USER to random values

* Fix jinja linebreaks in local.yml

* Spaces in production.yml

* Fix post-merge leftovers & set DJANGO_ADMIN_URL automatically

* Prettify here and there

* Fix FileNotFoundError

* Leave a TODO in post_gen_hook.py

* Introduce keep_local_envs_in_vcs option

* Remove envs when not opted for

* Inline pre_gen_project.py if-condition

* Get rid of PROJECT_DIR_PATH in post_gen_project.py

* Clean up the docs

* Match copyright notices

* Document envs ins and outs
2018-03-08 15:56:15 +03:00
Nikita Shupeyko
86e33e8714
Refactor *_gen_project hooks (#1490)
* Fix ./hooks/pre_gen_project.py asking user to select an option once only

+ prettify output

* Fix pre_gen hook not really exiting when it should

* Refactor & prettify ./hooks/post_gen_project.py

* Ensure same POSTGRES_USER is set across environments

+ get rid of env.example in favor of pre-generated .env.
2018-02-07 22:52:52 +03:00
Shupeyko Nikita
188ff966f8 Re-organize compose/ into environment-specific file groups (#1317)
* Re-organize compose/ into environment-specific file groups

Closes #1316.

* Commit missing files

That was weird: git failed to commit one specific folder previously
2017-09-05 14:39:20 +03:00
Shupeyko Nikita
833a79ff3c Remove pycharm service from Docker setup (#1307)
* Remove pycharm service from Docker setup

* Update generated project docs
2017-08-31 19:25:58 +03:00
Wan Liuyang
c50c6a73be Rename Dockerfile-dev to Dockerfile-local (#1305)
* Rename Dockerfile-dev to Dockerfile-local

* Add @sfdye to CONTRIBUTORS.rst
2017-08-28 11:00:59 +03:00
Shupeyko Nikita
035dc4d7ab Introduce development-time Celery services (#1257)
* Introduce development-time Celery services

Closes #1225.

* Re-order django and postgres services in production.yml

* Switch local service extension tactics

* Fix celery services inheriting ports from the django's
2017-08-11 09:13:30 +02:00
Shupeyko Nikita
e889316b11 Rename dev.yml to local.yml (#1227)
* Rename dev.yml to local.yml

Closes #1226.

* Rename docker-compose.yml to production.yml
2017-07-14 17:09:41 +03:00