Skip to content

Release EE/CE 2025.7.2 config #514

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Release EE/CE 2025.7.2 config #514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
00f6211
ee docker compose files
MarcelGeo Sep 24, 2025
3a281fa
Update redis service name
fernandinand Sep 25, 2025
f14e7a8
change default of archive size
MarcelGeo Sep 29, 2025
f4388a5
Cleanup env template fom qgis extactor urls
MarcelGeo Oct 8, 2025
55fac10
Upgrade to 7.3 images
MarcelGeo Oct 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions deployment/community/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand All @@ -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
Expand All @@ -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:
Expand Down
6 changes: 1 addition & 5 deletions deployment/enterprise/.env.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion deployment/enterprise/docker-compose.maps.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,15 @@ 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
environment:
- OVERVIEWS_DATA_DIR=/data
- MM_WMS_TILE_BUFFER=100
- MM_WMS_AVOID_ARTIFACTS=1
- BROKER_URL=redis://redis:6379/0
- CELERY_RESULT_BACKEND=redis://redis:6379/0
volumes:
- ./map_data:/data
8 changes: 4 additions & 4 deletions deployment/enterprise/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.3
container_name: merginmaps-server
restart: always
user: 901:999
Expand All @@ -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.3
container_name: merginmaps-web
restart: always
depends_on:
Expand Down Expand Up @@ -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.3
container_name: merginmaps-celery-beat
restart: always
user: 901:999
Expand All @@ -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.3
container_name: merginmaps-celery-worker
restart: always
user: 901:999
Expand Down
Loading