From 00f6211cf357a955f245e10d7c7373928edf806d Mon Sep 17 00:00:00 2001 From: "marcel.kocisek" Date: Wed, 24 Sep 2025 17:57:14 +0200 Subject: [PATCH 1/5] ee docker compose files --- deployment/enterprise/docker-compose.maps.yml | 4 +++- deployment/enterprise/docker-compose.yml | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/deployment/enterprise/docker-compose.maps.yml b/deployment/enterprise/docker-compose.maps.yml index 24cacb43..5b4d0539 100644 --- a/deployment/enterprise/docker-compose.maps.yml +++ b/deployment/enterprise/docker-compose.maps.yml @@ -30,7 +30,7 @@ services: - ./qgis_nginx.conf:/etc/nginx/conf.d/default.conf qgis_extractor: container_name: mergin-qgis-extractor - image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/qgis-extractor-ee:2025.1.0 + image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/qgis-extractor-ee:2025.3.0 user: 901:999 networks: - mergin-net @@ -38,5 +38,7 @@ services: - OVERVIEWS_DATA_DIR=/data - MM_WMS_TILE_BUFFER=100 - MM_WMS_AVOID_ARTIFACTS=1 + - BROKER_URL=redis://mergin-redis:6379/0 + - CELERY_RESULT_BACKEND=redis://mergin-redis:6379/0 volumes: - ./map_data:/data diff --git a/deployment/enterprise/docker-compose.yml b/deployment/enterprise/docker-compose.yml index 902a66ef..24448236 100644 --- a/deployment/enterprise/docker-compose.yml +++ b/deployment/enterprise/docker-compose.yml @@ -5,7 +5,7 @@ networks: services: server: - image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/mergin-ee-back:2025.5.1 + image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/mergin-ee-back:2025.7.2 container_name: merginmaps-server restart: always user: 901:999 @@ -22,7 +22,7 @@ services: networks: - mergin web: - image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/mergin-ee-front:2025.5.1 + image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/mergin-ee-front:2025.7.2 container_name: merginmaps-web restart: always depends_on: @@ -52,7 +52,7 @@ services: - server celery-beat: - image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/mergin-ee-back:2025.5.1 + image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/mergin-ee-back:2025.7.2 container_name: merginmaps-celery-beat restart: always user: 901:999 @@ -66,7 +66,7 @@ services: - mergin celery-worker: - image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/mergin-ee-back:2025.5.1 + image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/mergin-ee-back:2025.7.2 container_name: merginmaps-celery-worker restart: always user: 901:999 From 3a281fa64e4eedee3aa9a05a099f3632964ec212 Mon Sep 17 00:00:00 2001 From: Fernandinand Date: Thu, 25 Sep 2025 15:05:56 +0100 Subject: [PATCH 2/5] Update redis service name --- deployment/enterprise/docker-compose.maps.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deployment/enterprise/docker-compose.maps.yml b/deployment/enterprise/docker-compose.maps.yml index 5b4d0539..0ad63661 100644 --- a/deployment/enterprise/docker-compose.maps.yml +++ b/deployment/enterprise/docker-compose.maps.yml @@ -38,7 +38,7 @@ services: - OVERVIEWS_DATA_DIR=/data - MM_WMS_TILE_BUFFER=100 - MM_WMS_AVOID_ARTIFACTS=1 - - BROKER_URL=redis://mergin-redis:6379/0 - - CELERY_RESULT_BACKEND=redis://mergin-redis:6379/0 + - BROKER_URL=redis://redis:6379/0 + - CELERY_RESULT_BACKEND=redis://redis:6379/0 volumes: - ./map_data:/data From f14e7a899ea4bee58aeaadfdb6040c2b4646ee0c Mon Sep 17 00:00:00 2001 From: "marcel.kocisek" Date: Mon, 29 Sep 2025 10:04:43 +0200 Subject: [PATCH 3/5] change default of archive size --- deployment/enterprise/.env.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/enterprise/.env.template b/deployment/enterprise/.env.template index 663ba5ac..12ca4ae4 100644 --- a/deployment/enterprise/.env.template +++ b/deployment/enterprise/.env.template @@ -117,7 +117,7 @@ LOCAL_PROJECTS=/data # data download -#MAX_DOWNLOAD_ARCHIVE_SIZE=1024 * 1024 * 1024 # max total files size in bytes for archive download +#MAX_DOWNLOAD_ARCHIVE_SIZE=1024 * 1024 * 1024 * 10 # max total files size in bytes for archive download #USE_X_ACCEL=False # use nginx (in front of gunicorn) to serve files (https://www.nginx.com/resources/wiki/start/topics/examples/x-accel/) USE_X_ACCEL=1 From f4388a5aa7f2d4aa27d630b618985c155547ecb6 Mon Sep 17 00:00:00 2001 From: "marcel.kocisek" Date: Wed, 8 Oct 2025 10:55:48 +0200 Subject: [PATCH 4/5] Cleanup env template fom qgis extactor urls --- deployment/enterprise/.env.template | 4 ---- 1 file changed, 4 deletions(-) diff --git a/deployment/enterprise/.env.template b/deployment/enterprise/.env.template index 12ca4ae4..b66eb37c 100644 --- a/deployment/enterprise/.env.template +++ b/deployment/enterprise/.env.template @@ -214,12 +214,8 @@ VECTOR_TILES_URL=https://tiles-ee.merginmaps.com/data/default/{z}/{x}/{y}.pbf VECTOR_TILES_STYLE_URL=https://tiles-ee.merginmaps.com//styles/default.json -#QGIS_EXTRACTOR_API_URL=http://mergin-qgis-extractor:8000 - #WMTS_SERVER_URL=http://mergin-qgis-nginx:80 -#QGIS_EXTRACTOR_TIMEOUT=60 - #OVERVIEW_MAX_FILE_SIZE=1048576 # 1MB ### Diagnostic logs from Mobile and QGIS Plugin From 55fac10fc2e5efd64538855142e79dafcaea3d2c Mon Sep 17 00:00:00 2001 From: "marcel.kocisek" Date: Wed, 8 Oct 2025 11:38:58 +0200 Subject: [PATCH 5/5] Upgrade to 7.3 images --- deployment/community/docker-compose.yml | 8 ++++---- deployment/enterprise/docker-compose.yml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/deployment/community/docker-compose.yml b/deployment/community/docker-compose.yml index 3a5b2665..e983b218 100644 --- a/deployment/community/docker-compose.yml +++ b/deployment/community/docker-compose.yml @@ -23,7 +23,7 @@ services: networks: - merginmaps server: - image: lutraconsulting/merginmaps-backend:2025.2.2 + image: lutraconsulting/merginmaps-backend:2025.7.3 container_name: merginmaps-server restart: always user: 901:999 @@ -39,7 +39,7 @@ services: networks: - merginmaps celery-beat: - image: lutraconsulting/merginmaps-backend:2025.2.2 + image: lutraconsulting/merginmaps-backend:2025.7.3 container_name: celery-beat restart: always env_file: @@ -54,7 +54,7 @@ services: networks: - merginmaps celery-worker: - image: lutraconsulting/merginmaps-backend:2025.2.2 + image: lutraconsulting/merginmaps-backend:2025.7.3 container_name: celery-worker restart: always user: 901:999 @@ -73,7 +73,7 @@ services: networks: - merginmaps web: - image: lutraconsulting/merginmaps-frontend:2025.2.2 + image: lutraconsulting/merginmaps-frontend:2025.7.3 container_name: merginmaps-web restart: always depends_on: diff --git a/deployment/enterprise/docker-compose.yml b/deployment/enterprise/docker-compose.yml index 24448236..740e7492 100644 --- a/deployment/enterprise/docker-compose.yml +++ b/deployment/enterprise/docker-compose.yml @@ -5,7 +5,7 @@ networks: services: server: - image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/mergin-ee-back:2025.7.2 + image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/mergin-ee-back:2025.7.3 container_name: merginmaps-server restart: always user: 901:999 @@ -22,7 +22,7 @@ services: networks: - mergin web: - image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/mergin-ee-front:2025.7.2 + image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/mergin-ee-front:2025.7.3 container_name: merginmaps-web restart: always depends_on: @@ -52,7 +52,7 @@ services: - server celery-beat: - image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/mergin-ee-back:2025.7.2 + image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/mergin-ee-back:2025.7.3 container_name: merginmaps-celery-beat restart: always user: 901:999 @@ -66,7 +66,7 @@ services: - mergin celery-worker: - image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/mergin-ee-back:2025.7.2 + image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/mergin-ee-back:2025.7.3 container_name: merginmaps-celery-worker restart: always user: 901:999