Use env vars to select between dev and prod #158
Merged
Conversation
This file contains 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
vladbogo
force-pushed
the
dev_env
branch
6 times, most recently
from
99c2c37
to
05b3efe
Compare
fauust
reviewed
Aug 11, 2023
rsync.exclude
Outdated
| @@ -6,3 +6,4 @@ ci_build_images | |||
| docker-compose/logs | |||
| docker-compose/mariadb | |||
| master-private.cfg | |||
| dockerfiles | |||
There was a problem hiding this comment.
I may be wrong but this seems to be needed by one of the master (nonstandard or galera, not sure exactly which one).
| @@ -344,7 +342,7 @@ c['multiMaster'] = True | |||
|
|
|||
| c['mq'] = { # Need to enable multimaster aware mq. Wamp is the only option for now. | |||
| 'type' : 'wamp', | |||
| 'router_url': 'ws://crossbar:8085/ws', | |||
| 'router_url': os.getenv('MQ_ROUTER_URL', default='ws://localhost:8085/ws'), | |||
There was a problem hiding this comment.
the default should be crossbar:8085 (since this is what we will use in the future).
docker-compose/docker-compose.yaml
Outdated
| - TITLE=MariaDB CI | ||
| - TITLE_URL=https://github.com/MariaDB/server | ||
| - BUILDMASTER_URL=https://buildbot.dev.mariadb.org/ | ||
| - MQ_ROUTER_URL=ws://crossbar:8085/ws |
There was a problem hiding this comment.
This seems wrong to me, you should rely on the env file and just define which environment variable are exposed in the container:
environment:
- TITLE
- TITLE_URL
- BUILDMASTER_URL
- MQ_ROUTER_URLAnd then the stack is started with either:
docker-compose --env-file dev.env up -dor
docker-compose --env-file prod.env up -dSee: https://gitlab.com/mariadb/downloads-mariadb-python3/-/blob/master/.gitlab-ci/deploy-dev.yml and https://gitlab.com/mariadb/downloads-mariadb-python3/-/tree/master/docker?ref_type=heads for examples.
vladbogo
force-pushed
the
dev_env
branch
2 times, most recently
from
3fd6853
to
e697647
Compare
|
LGTM feel free to merge. |
vladbogo
force-pushed
the
dev_env
branch
3 times, most recently
from
1606617
to
f263613
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.