Commit Graph

103 Commits

Author SHA1 Message Date
dependabot[bot]
5bc3df7650
Upgrade to node v18 (#4294)
* Bump node in /{{cookiecutter.project_slug}}/compose/local/node

Bumps node from 16-bullseye-slim to 18-bullseye-slim.

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

Signed-off-by: dependabot[bot] <support@github.com>

* Update to node 18 in prod Dockerfile

* Update to node 18 in package.json

* Update node version in CI

* Update node version in documentation

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Bruno Alla <alla.brunoo@gmail.com>
2023-04-26 08:06:56 +01:00
Bruno Alla
15c933c206
Fix comment typos in Dockerfiles 2023-04-25 10:44:02 +02:00
dependabot[bot]
ebbb4b3673
Bump traefik from 2.9.10 to 2.10.0 (#4290)
Bumps traefik from 2.9.10 to 2.10.0.

---
updated-dependencies:
- dependency-name: traefik
  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-04-25 09:13:42 +01:00
Bruno Alla
0dcc4c4b4c
Add more pre-commit hooks (#4266)
* Add more hooks from pre-commit-hooks repo

* Add pre-commit hook for prettier

* Format with prettier

* Remove check-docstring-first hook

* Run prettier in the template

* Tweak formatting of dependabot file

* Fix formatting of GitHub files for prettier

* More format fixes of ci.yml
2023-04-15 12:15:15 +01:00
Jelmer
42c30dafcb
Upgrade Python to version 3.11 (Faster CPython) (#4256)
* Upgrade Python to version 3.11 (Faster CPython)

* Update pyupgrade config for Python 3.11

* Update tox env to Python 3.11

* Update to latest Python 3.11.3

* Add a note about lack of support in PythonAnywhere

* Rephrase note

* Fix casing

---------

Co-authored-by: Bruno Alla <alla.brunoo@gmail.com>
Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
2023-04-15 11:42:33 +01:00
dependabot[bot]
73b16539d4
Upgrade traefik to 2.9.10 (#4267)
---
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-04-07 08:33:13 +01:00
Bruno Alla
a607284e1f
Update indent for nginx config file (#4260) 2023-04-05 21:32:05 +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
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
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
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
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
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
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
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
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
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
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
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