diff options
| author | Fabian Mastenbroek <mail.fabianm@gmail.com> | 2021-10-25 14:53:54 +0200 |
|---|---|---|
| committer | Fabian Mastenbroek <mail.fabianm@gmail.com> | 2021-10-25 14:53:54 +0200 |
| commit | aa9b32f8cd1467e9718959f400f6777e5d71737d (patch) | |
| tree | b88bbede15108c6855d7f94ded4c7054df186a72 /docker-compose.yml | |
| parent | eb0e0a3bc557c05a70eead388797ab850ea87366 (diff) | |
| parent | b7a71e5b4aa77b41ef41deec2ace42b67a5a13a7 (diff) | |
merge: Integrate v2.1 progress into public repository
This pull request integrates the changes planned for the v2.1 release of
OpenDC into the public Github repository in order to sync the progress
of both repositories.
Diffstat (limited to 'docker-compose.yml')
| -rw-r--r-- | docker-compose.yml | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index ac2e6041..18847736 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,19 +1,18 @@ version: "3.8" services: frontend: - build: - context: opendc-web/opendc-web-ui - image: frontend + image: atlargeresearch/opendc-web-ui:v2.1 restart: on-failure networks: - backend environment: - REACT_APP_OAUTH_CLIENT_ID: ${OPENDC_OAUTH_CLIENT_ID} - REACT_APP_SENTRY_DSN: ${OPENDC_FRONTEND_SENTRY_DSN-} + NEXT_PUBLIC_AUTH0_DOMAIN: ${OPENDC_AUTH0_DOMAIN} + NEXT_PUBLIC_AUTH0_CLIENT_ID: ${OPENDC_AUTH0_CLIENT_ID} + NEXT_PUBLIC_AUTH0_AUDIENCE: ${OPENDC_AUTH0_AUDIENCE} + NEXT_PUBLIC_SENTRY_DSN: ${OPENDC_FRONTEND_SENTRY_DSN-} api: - build: opendc-web/opendc-web-api - image: api + image: atlargeresearch/opendc-web-api:v2.1 restart: on-failure networks: - backend @@ -33,8 +32,7 @@ services: - SENTRY_ENVIRONMENT simulator: - build: . - image: simulator + image: atlargeresearch/opendc:v2.1 restart: on-failure networks: - backend @@ -45,16 +43,16 @@ services: source: ./traces target: /opt/opendc/traces environment: - - OPENDC_DB - - OPENDC_DB_USERNAME - - OPENDC_DB_PASSWORD - - OPENDC_DB_HOST=mongo + - OPENDC_API_URL=${OPENDC_API_BASE_URL} + - AUTH0_DOMAIN=${OPENDC_AUTH0_DOMAIN} + - AUTH0_AUDIENCE=${OPENDC_AUTH0_AUDIENCE} + - AUTH0_CLIENT_ID=${OPENDC_AUTH0_CLIENT_ID_RUNNER} + - AUTH0_CLIENT_SECRET=${OPENDC_AUTH0_CLIENT_SECRET_RUNNER} - SENTRY_DSN=${OPENDC_SIMULATOR_SENTRY_DSN-} - SENTRY_ENVIRONMENT mongo: - build: - context: database + build: database restart: on-failure environment: - MONGO_INITDB_ROOT_USERNAME |