add env variable for THUMBOR and allow to set network name in .env

.env.example

@@ -74,6 +74,7 @@ LOCATIONS_SEARCH_API="https://api3.geo.admin.ch/rest/services/api/SearchServer"
 LOCATIONS_SEARCH_API_DETAILS="https://api3.geo.admin.ch/rest/services/api/MapServer/ch.bfs.gebaeude_wohnungs_register/"
 # Local directory on docker host for temporary storage of archive folders
 ARCHIVE_DIR=
+# Isolated network for print service
 # This has to be unique for multiple instance on same docker host
 ISOLATED_NETWORK_NAME=geocity_isolated_1
 # IBAN for user profile, true will show in submission detail and section author
@@ -90,3 +91,8 @@ PAYMENT_PROCESSING_TEST_ENVIRONMENT=true
 LOCAL_TIME_ZONE_UTC=+1
 # Use "localhost" in local
 SITE_DOMAIN=None
+# Use thumbor service to resize images (used by Agenda module)
+USE_THUMBOR=false
+# Geocity network in order to communicate with other docker services on same host
+# This has to be unique for multiple instance on same docker host
+GEOCITY_NETWORK_NAME=geocity_network_dev

docker-compose.yml

@@ -115,5 +115,5 @@ networks:
   isolated:
     name: ${ISOLATED_NETWORK_NAME}
   geocity_network:
-    name: geocity_network
+    name: ${GEOCITY_NETWORK_NAME}
     driver: bridge

geocity/apps/api/views.py

@@ -520,11 +520,14 @@ def image_thumbor_display(request, submission_id, image_name):
 
     thumbor_params += f"{width}x{height}/filters:format({format})"
 
-    try:
-        response = requests.get(
-            f"{config.THUMBOR_SERVICE_URL}/{thumbor_params}/{image_url}"
-        )
-    except requests.exceptions.RequestException as e:
+    if settings.USE_THUMBOR:
+        try:
+            response = requests.get(
+                f"{config.THUMBOR_SERVICE_URL}/{thumbor_params}/{image_url}"
+            )
+        except requests.exceptions.RequestException as e:
+            response = requests.get(image_url)
+    else:
         response = requests.get(image_url)
 
     mime_type = get_mime_type(response.content)

geocity/settings.py

@@ -117,6 +117,9 @@
 # Allow REMOTE_USER Authentication
 ALLOW_REMOTE_USER_AUTH = os.getenv("ALLOW_REMOTE_USER_AUTH", "false").lower() == "true"
 
+# IBAN for UserProfile model
+USE_THUMBOR = os.getenv("USE_THUMBOR", "false").lower() == "true"
+
 SITE_HTTPS = ENV == "PROD"
 
 # Allow CORS in DEV, needed for development of geocity_front, where the frontend domain is different