Skip to content

Commit 5aad0c3

Browse files
authored
Merge pull request #570 from MerginMaps/569-clarify-docker-compose-changes-for-release-202520
Give more background to infrastructure changes on release 2025.2.0 #569
2 parents 6413d75 + 69d0958 commit 5aad0c3

File tree

2 files changed

+17
-6
lines changed

2 files changed

+17
-6
lines changed

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ services:
88
working_dir: "/docs"
99
command: /bin/sh -c 'yarn install && yarn dev'
1010
ports:
11-
- 8080:8080
11+
- 8081:8080

src/server/upgrade/index.md

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,31 @@ Get the latest <GitHubRepo id="MerginMaps/server/blob/master/docker-compose.yml"
1616
Perform the migration:
1717

1818
<MigrationType type="EE" />
19+
::: tip Before you upgrade!
20+
Release 2025.2.0 brings significant changes on <MainPlatformName /> docker compose orchestration infrastructure.
1921

20-
1. Double check if below environment variables are available and filled in `.prod.env` environment file. If not, add them.
22+
Previous individual `server` container is replaced by 3 service dedicated containers that split the core components of <MainPlatformName />, `server-gunicorn` the app, `celery-beat` Celery task scheduler and `celery-worker` a dedicated worker container for Celery tasks.
23+
:::
24+
25+
1. Stop your running docker containers and build the new images
26+
```bash
27+
$ docker compose -f docker-compose.yml down # or similarly, based on your deployment
28+
# INFO: After shutdown update the docker-compose.yml file to latest release
29+
```
30+
31+
2. Double check if below environment variables are available and filled in `.prod.env` environment file. If not, add them.
2132

2233
```bash
2334
SECURITY_EMAIL_SALT='<YOUR STRONG HASH>'
2435
SECURITY_BEARER_SALT='<YOUR STRONG HASH>'
2536
```
2637

27-
2. Start up your docker containers
38+
3. Start up your docker containers
2839
```bash
29-
$ docker-compose -f docker-compose.yml up # or similarly, based on your deployment
40+
$ docker compose -f docker-compose.yml -d up # or similarly, based on your deployment
3041
```
3142

32-
3. Check that you are on correct versions (`07f2185e2428`, `df5b4efdae7b`).
43+
4. Check that you are on correct versions (`07f2185e2428`, `df5b4efdae7b`).
3344
```bash
3445
$ docker exec merginmaps-server flask db current
3546
INFO [alembic.runtime.migration] Context impl PostgresqlImpl.
@@ -44,7 +55,7 @@ Perform the migration:
4455
$ docker exec merginmaps-server flask db stamp df5b4efdae7b
4556
```
4657

47-
4. Run the database migration:
58+
5. Run the database migration:
4859
```bash
4960
$ docker exec merginmaps-server flask db upgrade community@ba5051218de4
5061
$ docker exec merginmaps-server flask db upgrade enterprise@ba5ae5972c4a

0 commit comments

Comments
 (0)