From 8d23eeac74246f39bccd3643ef1f5370ae686047 Mon Sep 17 00:00:00 2001 From: Raruto Date: Wed, 17 Aug 2022 14:40:15 +0200 Subject: [PATCH 1/3] Remove duplicated `G3WSUITE_GUNICORN_TIMEOUT` --- docker-compose-dev.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index 06d7f4e5a..f31d17025 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -42,7 +42,6 @@ services: - G3WSUITE_ORS_API_ENDPOINT - G3WSUITE_ORS_API_KEY - G3WSUITE_DEBUG - - G3WSUITE_GUNICORN_TIMEOUT - TILESTACHE_CACHE_BUFFER_SIZE - TILESTACHE_CACHE_TOKEN - G3WSUITE_GUNICORN_NUM_WORKERS From 971e6643dab599a99f646dac3d00bc8166907eb6 Mon Sep 17 00:00:00 2001 From: Raruto Date: Fri, 19 Aug 2022 09:21:37 +0200 Subject: [PATCH 2/3] update TEMPLATES DIRS within settings_docker.py --- config/g3w-suite/settings_docker.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config/g3w-suite/settings_docker.py b/config/g3w-suite/settings_docker.py index aa9c87325..3670c0c58 100644 --- a/config/g3w-suite/settings_docker.py +++ b/config/g3w-suite/settings_docker.py @@ -2,6 +2,11 @@ # Destination: /code/g3w-admin/base/settings/local_settings.py # Read connection parameters from environment import os +from base.settings.base import TEMPLATES, BASE_DIR + +# Allows to load custom templates from your docker volume (eg. "./config/g3w-suite/overrides/templates:/code/templates:ro") +# see: https://docs.djangoproject.com/en/2.2/howto/overriding-templates/ +TEMPLATES[0]['DIRS'].append(os.path.join(BASE_DIR, '../../templates')) G3WADMIN_PROJECT_APPS = [] From 289b3b2892736494312637957a9c9456cc7de880 Mon Sep 17 00:00:00 2001 From: Raruto Date: Fri, 19 Aug 2022 09:29:21 +0200 Subject: [PATCH 3/3] Disable auto-restart for `docker-compose.dev` services --- docker-compose-dev.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index 06d7f4e5a..4d0b3f0a2 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -9,7 +9,7 @@ services: - POSTGRES_USER=${G3WSUITE_POSTGRES_USER_LOCAL} - POSTGRES_PASS=${G3WSUITE_POSTGRES_PASS} - ALLOW_IP_RANGE=0.0.0.0/0 - restart: on-failure + restart: "no" logging: driver: "json-file" options: @@ -56,7 +56,7 @@ services: - "8000" ports: - "8000:8000" - restart: always + restart: "no" logging: driver: "json-file" options: