From ce95cfdf803043e66e2279d0f76c6bfc64e7864e Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Tue, 18 May 2021 11:18:11 +0200 Subject: ui: Fix frontend deployment scripts This change fixes the deployment scripts necessary for the frontend and ensures that runtime variables work again. --- docker-compose.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'docker-compose.yml') diff --git a/docker-compose.yml b/docker-compose.yml index 150445dc..b6246613 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,8 +8,10 @@ services: 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 -- cgit v1.2.3 From 6752b6d50faab447b3edc13bddf14f53401392f1 Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Fri, 2 Jul 2021 17:52:12 +0200 Subject: runner: Use public API for scheduling simulation jobs This change updates the web runner to not require direct database access for scheduling simulation jobs. Instead, the runner polls the public REST API for available jobs and reports its results through there. --- docker-compose.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'docker-compose.yml') diff --git a/docker-compose.yml b/docker-compose.yml index b6246613..b5d8cb98 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -47,10 +47,11 @@ services: source: ./traces target: /app/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 -- cgit v1.2.3 From fe4cf5f4ecb99b6313b9c3c69557d228e2a34796 Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Fri, 10 Sep 2021 13:23:50 +0200 Subject: fix(docker): Mount local traces to correct container directory This change fixes an issue where local traces are not correctly detected due to Docker mounting the local traces in the incorrect directory. --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker-compose.yml') diff --git a/docker-compose.yml b/docker-compose.yml index b5d8cb98..c9459e5a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -45,7 +45,7 @@ services: volumes: - type: bind source: ./traces - target: /app/traces + target: /opt/opendc/traces environment: - OPENDC_API_URL=${OPENDC_API_BASE_URL} - AUTH0_DOMAIN=${OPENDC_AUTH0_DOMAIN} -- cgit v1.2.3 From 8f978b683ab51e37f6bdda65f4dc40d11a5e38b7 Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Fri, 10 Sep 2021 13:26:26 +0200 Subject: fix(docker): Do not warn when Sentry is not configured This change updates the Docker Compose configuration to not warn the user when they have not specified any Sentry configuration. Since Sentry is optional, the user should not be presented warnings. --- docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docker-compose.yml') diff --git a/docker-compose.yml b/docker-compose.yml index c9459e5a..57d2e021 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: 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} + NEXT_PUBLIC_SENTRY_DSN: ${OPENDC_FRONTEND_SENTRY_DSN-} api: build: opendc-web/opendc-web-api @@ -31,7 +31,7 @@ services: - OPENDC_DB_HOST=mongo - OPENDC_FLASK_SECRET - OPENDC_OAUTH_CLIENT_ID - - SENTRY_DSN=${OPENDC_API_SENTRY_DSN} + - SENTRY_DSN=${OPENDC_API_SENTRY_DSN-} - SENTRY_ENVIRONMENT simulator: @@ -52,7 +52,7 @@ services: - 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_DSN=${OPENDC_SIMULATOR_SENTRY_DSN-} - SENTRY_ENVIRONMENT mongo: -- cgit v1.2.3 From 61d74355a7b702917ae314c1c595b24fb8621a21 Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Fri, 10 Sep 2021 15:53:59 +0200 Subject: fix(docker): Default to public images for deployment This change updates the Docker Compose configuration to default to the available public images for OpenDC, in order to remove the requirement for building OpenDC locally. --- docker-compose.yml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'docker-compose.yml') diff --git a/docker-compose.yml b/docker-compose.yml index 57d2e021..18847736 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,9 +1,7 @@ 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 @@ -14,8 +12,7 @@ services: 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 @@ -35,8 +32,7 @@ services: - SENTRY_ENVIRONMENT simulator: - build: . - image: simulator + image: atlargeresearch/opendc:v2.1 restart: on-failure networks: - backend @@ -56,8 +52,7 @@ services: - SENTRY_ENVIRONMENT mongo: - build: - context: database + build: database restart: on-failure environment: - MONGO_INITDB_ROOT_USERNAME -- cgit v1.2.3