Skip to content

Commit 36518fb

Browse files
authored
Merge pull request #514 from MerginMaps/ee-ce-2025.7.2
Release EE/CE 2025.7.3 config
2 parents 846a396 + 55fac10 commit 36518fb

File tree

4 files changed

+12
-14
lines changed

4 files changed

+12
-14
lines changed

deployment/community/docker-compose.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ services:
2323
networks:
2424
- merginmaps
2525
server:
26-
image: lutraconsulting/merginmaps-backend:2025.2.2
26+
image: lutraconsulting/merginmaps-backend:2025.7.3
2727
container_name: merginmaps-server
2828
restart: always
2929
user: 901:999
@@ -39,7 +39,7 @@ services:
3939
networks:
4040
- merginmaps
4141
celery-beat:
42-
image: lutraconsulting/merginmaps-backend:2025.2.2
42+
image: lutraconsulting/merginmaps-backend:2025.7.3
4343
container_name: celery-beat
4444
restart: always
4545
env_file:
@@ -54,7 +54,7 @@ services:
5454
networks:
5555
- merginmaps
5656
celery-worker:
57-
image: lutraconsulting/merginmaps-backend:2025.2.2
57+
image: lutraconsulting/merginmaps-backend:2025.7.3
5858
container_name: celery-worker
5959
restart: always
6060
user: 901:999
@@ -73,7 +73,7 @@ services:
7373
networks:
7474
- merginmaps
7575
web:
76-
image: lutraconsulting/merginmaps-frontend:2025.2.2
76+
image: lutraconsulting/merginmaps-frontend:2025.7.3
7777
container_name: merginmaps-web
7878
restart: always
7979
depends_on:

deployment/enterprise/.env.template

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ LOCAL_PROJECTS=/data
117117

118118
# data download
119119

120-
#MAX_DOWNLOAD_ARCHIVE_SIZE=1024 * 1024 * 1024 # max total files size in bytes for archive download
120+
#MAX_DOWNLOAD_ARCHIVE_SIZE=1024 * 1024 * 1024 * 10 # max total files size in bytes for archive download
121121

122122
#USE_X_ACCEL=False # use nginx (in front of gunicorn) to serve files (https://www.nginx.com/resources/wiki/start/topics/examples/x-accel/)
123123
USE_X_ACCEL=1
@@ -214,12 +214,8 @@ VECTOR_TILES_URL=https://tiles-ee.merginmaps.com/data/default/{z}/{x}/{y}.pbf
214214

215215
VECTOR_TILES_STYLE_URL=https://tiles-ee.merginmaps.com//styles/default.json
216216

217-
#QGIS_EXTRACTOR_API_URL=http://mergin-qgis-extractor:8000
218-
219217
#WMTS_SERVER_URL=http://mergin-qgis-nginx:80
220218

221-
#QGIS_EXTRACTOR_TIMEOUT=60
222-
223219
#OVERVIEW_MAX_FILE_SIZE=1048576 # 1MB
224220

225221
### Diagnostic logs from Mobile and QGIS Plugin

deployment/enterprise/docker-compose.maps.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,15 @@ services:
3030
- ./qgis_nginx.conf:/etc/nginx/conf.d/default.conf
3131
qgis_extractor:
3232
container_name: mergin-qgis-extractor
33-
image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/qgis-extractor-ee:2025.1.0
33+
image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/qgis-extractor-ee:2025.3.0
3434
user: 901:999
3535
networks:
3636
- mergin-net
3737
environment:
3838
- OVERVIEWS_DATA_DIR=/data
3939
- MM_WMS_TILE_BUFFER=100
4040
- MM_WMS_AVOID_ARTIFACTS=1
41+
- BROKER_URL=redis://redis:6379/0
42+
- CELERY_RESULT_BACKEND=redis://redis:6379/0
4143
volumes:
4244
- ./map_data:/data

deployment/enterprise/docker-compose.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ networks:
55

66
services:
77
server:
8-
image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/mergin-ee-back:2025.5.1
8+
image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/mergin-ee-back:2025.7.3
99
container_name: merginmaps-server
1010
restart: always
1111
user: 901:999
@@ -22,7 +22,7 @@ services:
2222
networks:
2323
- mergin
2424
web:
25-
image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/mergin-ee-front:2025.5.1
25+
image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/mergin-ee-front:2025.7.3
2626
container_name: merginmaps-web
2727
restart: always
2828
depends_on:
@@ -52,7 +52,7 @@ services:
5252
- server
5353

5454
celery-beat:
55-
image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/mergin-ee-back:2025.5.1
55+
image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/mergin-ee-back:2025.7.3
5656
container_name: merginmaps-celery-beat
5757
restart: always
5858
user: 901:999
@@ -66,7 +66,7 @@ services:
6666
- mergin
6767

6868
celery-worker:
69-
image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/mergin-ee-back:2025.5.1
69+
image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/mergin-ee-back:2025.7.3
7070
container_name: merginmaps-celery-worker
7171
restart: always
7272
user: 901:999

0 commit comments

Comments
 (0)