-
Notifications
You must be signed in to change notification settings - Fork 20
Give more background to infrastructure changes on release 2025.2.0 #569 #570
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.
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
Merged
alex-cit
merged 2 commits into
main
from
569-clarify-docker-compose-changes-for-release-202520
Feb 28, 2025
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,4 +8,4 @@ services: | |
working_dir: "/docs" | ||
command: /bin/sh -c 'yarn install && yarn dev' | ||
ports: | ||
- 8080:8080 | ||
- 8081:8080 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -16,22 +16,34 @@ Get the latest <GitHubRepo id="MerginMaps/server/blob/master/docker-compose.yml" | |||||
Perform the migration: | ||||||
|
||||||
<MigrationType type="EE" /> | ||||||
::: tip Before you upgrade! | ||||||
Release 2025.2.0 brings significant changes on <MainPlatformName /> docker compose orchestration infrastructure. | ||||||
|
||||||
1. Double check if below environment variables are available and filled in `.prod.env` environment file. If not, add them. | ||||||
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. | ||||||
::: | ||||||
|
||||||
1. Stop your running docker containers and build the new images | ||||||
```bash | ||||||
$ docker compose -f docker-compose.yml down # or similarly, based on your deployment | ||||||
# INFO: After shutdown update the docker-compose.yml file to latest release | ||||||
$ docker compose -f docker-compose build # or similarly, based on your deployment | ||||||
``` | ||||||
|
||||||
2. Double check if below environment variables are available and filled in `.prod.env` environment file. If not, add them. | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
|
||||||
```bash | ||||||
SECURITY_EMAIL_SALT='<YOUR STRONG HASH>' | ||||||
SECURITY_BEARER_SALT='<YOUR STRONG HASH>' | ||||||
``` | ||||||
|
||||||
2. Start up your docker containers | ||||||
3. Start up your docker containers | ||||||
```bash | ||||||
$ docker-compose -f docker-compose.yml up # or similarly, based on your deployment | ||||||
$ docker compose -f docker-compose.yml -d up # or similarly, based on your deployment | ||||||
``` | ||||||
|
||||||
3. Check that you are on correct versions (`07f2185e2428`, `df5b4efdae7b`). | ||||||
4. Check that you are on correct versions (`07f2185e2428`, `df5b4efdae7b`). | ||||||
```bash | ||||||
$ docker exec merginmaps-server flask db current | ||||||
$ docker compose exec server flask db current | ||||||
varmar05 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||||||
INFO [alembic.runtime.migration] Context impl PostgresqlImpl. | ||||||
INFO [alembic.runtime.migration] Will assume transactional DDL. | ||||||
07f2185e2428 (head) | ||||||
|
@@ -40,14 +52,14 @@ Perform the migration: | |||||
|
||||||
- If you do not see the version numbers at all, run the following commands: | ||||||
```bash | ||||||
$ docker exec merginmaps-server flask db stamp 07f2185e2428 | ||||||
$ docker exec merginmaps-server flask db stamp df5b4efdae7b | ||||||
$ docker compose exec server flask db stamp 07f2185e2428 | ||||||
$ docker compose exec server flask db stamp df5b4efdae7b | ||||||
``` | ||||||
|
||||||
4. Run the database migration: | ||||||
5. Run the database migration: | ||||||
```bash | ||||||
$ docker exec merginmaps-server flask db upgrade community@ba5051218de4 | ||||||
$ docker exec merginmaps-server flask db upgrade enterprise@ba5ae5972c4a | ||||||
$ docker compose exec server flask db upgrade community@ba5051218de4 | ||||||
$ docker compose exec server flask db upgrade enterprise@ba5ae5972c4a | ||||||
``` | ||||||
|
||||||
|
||||||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.