Skip to content

Commit d330d08

Browse files
authored
Merge pull request #476 from MerginMaps/bump-2025.5.1
Bump 2025.5.1
2 parents 521a303 + 9b6de9d commit d330d08

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

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.0
8+
image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/mergin-ee-back:2025.5.1
99
container_name: merginmaps-server
1010
restart: always
1111
user: 901:999
@@ -21,7 +21,7 @@ services:
2121
networks:
2222
- mergin
2323
web:
24-
image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/mergin-ee-front:2025.5.0
24+
image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/mergin-ee-front:2025.5.1
2525
container_name: merginmaps-web
2626
restart: always
2727
depends_on:
@@ -51,7 +51,7 @@ services:
5151
- server
5252

5353
celery-beat:
54-
image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/mergin-ee-back:2025.5.0
54+
image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/mergin-ee-back:2025.5.1
5555
container_name: merginmaps-celery-beat
5656
restart: always
5757
user: 901:999
@@ -67,7 +67,7 @@ services:
6767
- mergin
6868

6969
celery-worker:
70-
image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/mergin-ee-back:2025.5.0
70+
image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/mergin-ee-back:2025.5.1
7171
container_name: merginmaps-celery-worker
7272
restart: always
7373
user: 901:999

server/mergin/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44

55

66
def get_version():
7-
return "2025.5.0"
7+
return "2025.5.1"

server/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
setup(
88
name="mergin",
9-
version="2025.5.0",
9+
version="2025.5.1",
1010
url="https://github.com/MerginMaps/mergin",
1111
license="AGPL-3.0-only",
1212
author="Lutra Consulting Limited",

0 commit comments

Comments
 (0)