Commit Graph

161 Commits

Author SHA1 Message Date
Bruno Alla
a607284e1f
Update indent for nginx config file (#4260) 2023-04-05 21:32:05 +01:00
Jelmer
f93a9f78d9
Replace runserver_plus with runserver (#4255)
* Replace runserver_plus with runserver since it is not compatible with django >= 4.1

* Replace runserver_plus with runserver in post_gen_hooks

---------

Co-authored-by: Bruno Alla <alla.brunoo@gmail.com>
2023-04-04 21:42:53 +01:00
Arkadiusz Michał Ryś
e13f7afcb8
Fix traefik rule priority for media router (#4244)
* Add option to serve media files locally using nginx

* Fix nginx media location and storage issue

* Fix traefik django-media typo

* Add certresolver property to web-media-router

* Add trailing slash in nginx configuration to avoid path traversal exploits

* Remove autoindexing from nginx configuration so nginx uses its default off setting

* Use nginx to serve media files if cloud provider is None

* Add back warning about lack of media files without Docker or Cloud providers

* Update documentation

* Fix typos and rephrase

Co-authored-by: Arkadiusz Ryś <arkadiusz.michal.rys@gmail.com>

* Change Traefik media router rule generation to force priority

The web-secure-router could end up having priority over the web-media-router when the www subdomain was used.
This fix adds the www subdomain to the web-media-router if it's also present in the web-secure-router rule.
Traefik looks at the length of rules to determine priority when no explicit priority is set.
The web-media-router needs to always have priority over the web-secure-router in order for the media files to be served.

* Add space to Traefik rule

---------

Co-authored-by: Bruno Alla <alla.brunoo@gmail.com>
Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
2023-04-04 10:25:06 +01:00
dependabot[bot]
68133e8354
Bump traefik from 2.9.8 to 2.9.9 (#4225)
Bumps traefik from 2.9.8 to 2.9.9.

---
updated-dependencies:
- dependency-name: traefik
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-23 17:15:43 +00:00
dependabot[bot]
1605101321
Bump Docker python image from 3.10.9 to 3.10.10 on production Django (#4214)
Bumps python from 3.10.9-slim-bullseye to 3.10.10-slim-bullseye.

---
updated-dependencies:
- dependency-name: python
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-16 17:13:53 +00:00
dependabot[bot]
96950f2191
Bump Docker python image from 3.10.9-slim-bullseye to 3.10.10-slim-bullseye for docs (#4213)
Bumps python from 3.10.9-slim-bullseye to 3.10.10-slim-bullseye.

---
updated-dependencies:
- dependency-name: python
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-16 16:35:57 +00:00
dependabot[bot]
6554049a87
Bump Docker python image from 3.10.9-slim-bullseye to 3.10.10-slim-bullseye for local Django service (#4212)
Bumps python from 3.10.9-slim-bullseye to 3.10.10-slim-bullseye.

---
updated-dependencies:
- dependency-name: python
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-16 16:35:28 +00:00
Bruno Alla
d90f16b647
Pin base Python Docker images to bugfix (#4194)
* Pin base Python Docker images to bugfix

Fix #1810

* Skip major & minor versions of Docker images in Dependabot

* Remove argument for docs Docker image

* Update Dependabot config of generated project
2023-03-16 16:05:02 +00:00
Arkadiusz Michał Ryś
06369bfd4c
Add option to serve media files locally using nginx (#2457)
* Add option to serve media files locally using nginx

* Fix nginx media location and storage issue

* Fix traefik django-media typo

* Add certresolver property to web-media-router

* Add trailing slash in nginx configuration to avoid path traversal exploits

* Remove autoindexing from nginx configuration so nginx uses its default off setting

* Use nginx to serve media files if cloud provider is None

* Add back warning about lack of media files without Docker or Cloud providers

* Update documentation

* Fix typos and rephrase

Co-authored-by: Arkadiusz Ryś <arkadiusz.michal.rys@gmail.com>

---------

Co-authored-by: Bruno Alla <alla.brunoo@gmail.com>
Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
2023-03-04 18:36:11 +00:00
dependabot[bot]
6a1aa159b6
Bump traefik from v2.2.11 to 2.9.8 (#4164)
Bumps traefik from v2.2.11 to 2.9.8.

---
updated-dependencies:
- dependency-name: traefik
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-26 20:47:54 +00:00
dependabot[bot]
757c9f45e2
Bump garland/aws-cli-docker from 1.15.47 to 1.16.140 (#4136)
Bumps garland/aws-cli-docker from 1.15.47 to 1.16.140.

---
updated-dependencies:
- dependency-name: garland/aws-cli-docker
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-25 12:44:24 +00:00
Bruno Alla
cbb0e19de7
Add Webpack support (#3623)
* Add support for Webpack as frontend pipeline

* Rename CI jobs

* Fix a couple of issues with Webpack + Docker

* Don't include Boostrap CSS from CDN with Webpack

* Rename variable

* Set publicPath in prod webpack config

* Fix removal of SASS files in post-gen hooks

* Add Webpack to readme usage section

* Run Django + Webpack dev server concurrently without Docker

* Fix async runserver command with Gulp/Webpack

* Upgrade django-webpack-loader to 1.5.0

* Pass variables required by Webpack at build time

* Upgrade django-webpack-loader to 1.7.0

* Add missing condition

* Add support for Azure Storage + Webpack

* Whitespaces

* Rename ROOT_DIR -> BASE_DIR

* Rename jobs

* Bump django-webpack-loader to latest

* Document limitation of Docker + Webpack + no Whitenoise

* Update section on custom Bootstrap compilation in generated readme
2023-01-29 12:12:12 +00:00
David
77695c7c10
Fix typo in flower start for watching celery (#3966) 2022-11-26 11:08:39 +00:00
Chao Yang Wu
51f4374a8a
Fix graceful shutdown of local dev containers and use watchfiles for beat + flower (#3925)
Co-authored-by: Bruno Alla <alla.brunoo@gmail.com>
Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
2022-11-23 14:51:20 +00:00
Jelmer
4ea0e98f3f
Upgrade Python version from 3.9 to 3.10 (#3913) 2022-10-24 21:41:00 +01:00
Bruno Alla
88c063f7ff
Remove --no-deps in pip wheels command of docs Dockerfile (#3875) 2022-09-24 14:37:12 +01:00
monosans
9cf280d343
Reload uvicorn on html file change (#3866) 2022-09-23 21:28:11 +01:00
monosans
26eff14308
Switch from watchgod to watchfiles (#3791) 2022-07-27 00:12:18 +01:00
jugglinmike
903fe45eca
Provide more context when wating for PostgreSQL takes too long (#3782) 2022-07-26 23:17:45 +01:00
Bruno Alla
ab4a32d558
Unify compressor, gulp and custom bootstrap options (#3535) 2022-03-20 15:00:40 +00:00
Bruno Alla
528a40989f
Fix cache dependency path for linter job in CI workflow (#3520)
* Fix cache dependency path for linter jon in CI workflow

* Reduce potential stylistic issues

* Reduce more potential stylistic issues
2022-01-07 22:26:56 +00:00
Andrew Chen Wang
e9ee4a930e
Fix docs compose (again) (#3494) 2021-12-26 16:04:33 +00:00
Andrew Chen Wang
fcb26de733
Fix docs not building (#3491) 2021-12-24 19:13:43 +00:00
Arnav Choudhury
0d8a91ebfe
Making docs image 40% smaller and also making python version upgrades easier for multi-stage builds. (#2836)
Co-authored-by: Bruno Alla <alla.brunoo@gmail.com>
2021-12-24 11:55:47 +00:00
Bruno Alla
9f359939a9
Upgrade JS dependencies and upgrade to node 16 (#3400) 2021-11-16 20:29:43 +00:00
Chao Yang Wu
dbaf09a5e1
Fix ungraceful Celery workers shutdown in container (#3405) 2021-11-16 08:57:08 +00:00
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
Fabio C. Barrionuevo da Luz
abba9de2bd Move ARG PYTHON_VERSION=3.9-slim-buster to the global scope
of production Dockerfile to fix #3187 which occurs when
 Gulp is selected as `js_task_runner` on project generation.
2021-05-17 22:22:08 -03: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
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