You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: src/server/environment/index.md
+6-9Lines changed: 6 additions & 9 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -116,7 +116,7 @@ Other settings related to data management.
116
116
|`DELETED_PROJECT_EXPIRATION`| integer |`7`| Lifetime in days for deleted projects. Expired projects are removed permanently without possibility to restore afterwards. |
117
117
|`PROJECT_ACCESS_REQUEST`| integer |`604800`| Lifetime of active project access request in seconds. |
118
118
|`TEMP_EXPIRATION`| integer |`7`| Time in days after files in a temporary folder are permanently deleted. |
119
-
119
+
120
120
121
121
#### Celery asynchronous tasks
122
122
Mergin Maps is using Celery and Redis to perform asynchronous tasks or doing regular jobs.
@@ -129,11 +129,8 @@ Mergin Maps is using Celery and Redis to perform asynchronous tasks or doing reg
Copy file name to clipboardExpand all lines: src/server/install/index.md
+2-2Lines changed: 2 additions & 2 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -89,10 +89,10 @@ Now tweak deployment settings by modifying environment variables. You have to fi
89
89
<ServerTypetype="EE" />
90
90
91
91
WebMaps consists of three more services (`mergin-qgis`, `mergin-qgis-extractor` and `mergin-qgis-nginx`) that you can run alongside <MainPlatformName /> main stack or independently in a new machine.
92
-
Just make sure related `MAPS_*`[environment variables](../environment/#WebMaps) are set, namely `MAPS_ENABLED` (`True` by default).
92
+
Just make sure `MAPS_ENABLED`[environment variable](../environment/) is set to `True` (`False` by default) and `VECTOR_TILES_URL` as well `VECTOR_TILES_STYLE_URL` are set correctly to your target tile service.
93
93
For convenience this stack is provided on a separate docker compose file, `docker-compose.maps.yml`.
94
94
95
-
To run the webmaps, simply run this command line:
95
+
To run the webmaps stack, simply run this command line:
Copy file name to clipboardExpand all lines: src/server/upgrade/index.md
+22-10Lines changed: 22 additions & 10 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -1,4 +1,4 @@
1
-
git# Upgrade
1
+
# Upgrade
2
2
3
3
Migration guides are here to help you migrate your <CommunityPlatformNameLink /> or <EnterprisePlatformNameLink /> to the latest server version. The main Cloud <DashboardLinkdesc="Mergin Maps Server"/> is always migrated to latest version by <MainPlatformName /> team. Read more about server platforms in [overview article](../).
4
4
@@ -15,22 +15,35 @@ Make sure to always back up your database data before doing a migration.
15
15
16
16
<MigrationTypetype="EE" />
17
17
18
+
::: tip Changes on deployment behaviour
19
+
Release 2025.3.x brings some changes on <MainPlatformName /> docker compose orchestration deployment procedure.
20
+
Users are advised to clone the <GitHubRepoid="MerginMaps/server/blob/master/"desc="server repository" /> in order to proceed with the new deployment procedure.
21
+
:::
22
+
18
23
Get the latest <GitHubRepoid="MerginMaps/server/blob/master/docker-compose.yml"desc="docker-compose file" /> or update docker images manually to version `2025.3.0`.
19
24
Perform the migration:
20
25
21
-
1. Stop your running docker containers and build the new images
26
+
1. Stop your running docker containers
22
27
```bash
23
-
$ docker compose -f docker-compose.yml down # or similarly, based on your deployment
28
+
$ docker compose -f docker-compose.yml down # or similarly, based on your previous deployment
24
29
# INFO: After shutdown update the docker-compose.yml file to latest release
25
30
```
26
-
27
-
2. Start up your docker containers
31
+
2. If you didn't clone the <MainPlatformName /> github repository, do it now and locate yourself under `deployment/enterprise` folder
32
+
```bash
33
+
$ git clone git@github.com:MerginMaps/server.git # If you haven't cloned the repo yet
34
+
$ cd server/deployment/enterprise
35
+
```
36
+
3. If you plan to use the new webmaps stacks, adapt your existing `.prod.env` and `docker-compose.yml` files. Move/copy them to the `enterprise` deployment folder
37
+
```bash
38
+
$ cp /some/path/.prod.env .# assuming you are located in `server/deployment/enterprise`
39
+
$ cp /some/path/docker-compose.yml .# assuming you are located in `server/deployment/enterprise`
40
+
```
41
+
4. Start up your docker containers
28
42
```bash
29
43
$ docker compose -f docker-compose.yml -d up # or similarly, based on your deployment
30
-
$ docker compose -f docker-compose.maps.yml -d up # If you want to deploy maps stack
44
+
$ docker compose -f docker-compose.maps.yml -d up # If you want to deploy webmaps stack
31
45
```
32
-
33
-
3. Check that you are on correct versions (`ba5051218de4`, `ba5ae5972c4a`).
46
+
5. Check that you are on correct versions (`ba5051218de4`, `ba5ae5972c4a`).
34
47
```bash
35
48
$ docker exec merginmaps-server flask db current
36
49
INFO [alembic.runtime.migration] Context impl PostgresqlImpl.
@@ -44,8 +57,7 @@ Perform the migration:
44
57
$ docker exec merginmaps-server flask db stamp ba5051218de4
45
58
$ docker exec merginmaps-server flask db stamp ba5ae5972c4a
46
59
```
47
-
48
-
4. Run the database migration:
60
+
6. Run the database migration:
49
61
```bash
50
62
$ docker exec merginmaps-server flask db upgrade community@5ad13be6f7ef
51
63
$ docker exec merginmaps-server flask db upgrade enterprise@819e6b20ee93
0 commit comments