Merge branch 'dev' of https://github.com/g3w-suite/g3w-suite-docker i…

…nto dev
g3w-suite · Sep 15, 2022 · 4cc32e4 · 4cc32e4
2 parents 1f0163e + e435dcc
commit 4cc32e4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git 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 = []
 

diff --git 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:
@@ -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
@@ -57,7 +56,7 @@ services:
       - "8000"
     ports:
       - "8000:8000"
-    restart: always
+    restart: "no"
     logging:
       driver: "json-file"
       options: