Commit Graph

57 Commits

Author SHA1 Message Date
Jelmer Draaijer
b61c70306f Update the docker base images from slim-buster to slim-bullseye 2021-10-26 13:40:42 +02:00
Bruno Alla
9cfb7646cb Update command line for Flower 2021-09-03 19:20:44 +01:00
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
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
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
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
53ffbbcf2e Multi stage Python build for Django 2020-09-11 22:00:50 +05:30
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
Yotam Tal
42101feef1 Add hot-reload support to celery worker 2020-04-21 13:45:30 +03: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
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
Agustin Scaramuzza
7e345d5fb3 Add PYTHONDONTWRITEBYTECODE flag to local development Dockerfile 2020-03-11 14:41:37 -03: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
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
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
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 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
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
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