diff options
| author | Fabian Mastenbroek <mail.fabianm@gmail.com> | 2022-02-17 16:52:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-17 16:52:02 +0100 |
| commit | a5b32960460b2e7b52032471bf23d29832734fba (patch) | |
| tree | 2ecf213097f2308b862fceb73374c6ff489faec6 /opendc-web | |
| parent | 02c215ad57e1e4d56c54d22be58e1845bdeebf25 (diff) | |
| parent | 49c9f371f19e4f13c45861922b7da33da24ecf49 (diff) | |
merge: Update deployment via Docker
This pull request updates the deployment process to be compatible with the latest auth changes.
- Support custom audience in web runner
- Fix API deployment using Docker Compose
- Actualize deployment guide
- Update to OpenJDK 17
**External Dependencies**
- Mongo 5
- OpenJDK 17
Diffstat (limited to 'opendc-web')
| -rw-r--r-- | opendc-web/opendc-web-api/requirements.txt | 1 | ||||
| -rw-r--r-- | opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/Main.kt | 12 |
2 files changed, 11 insertions, 2 deletions
diff --git a/opendc-web/opendc-web-api/requirements.txt b/opendc-web/opendc-web-api/requirements.txt index 45eae12b..6f3b42aa 100644 --- a/opendc-web/opendc-web-api/requirements.txt +++ b/opendc-web/opendc-web-api/requirements.txt @@ -11,7 +11,6 @@ Flask-Cors==3.0.9 Flask-SocketIO==4.3.1 flask-swagger-ui==3.36.0 Flask-Restful==0.3.8 -greenlet==0.4.17 httplib2==0.19.0 isort==4.3.21 itsdangerous==1.1.0 diff --git a/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/Main.kt b/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/Main.kt index 8f4e9d6d..94ef8f8e 100644 --- a/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/Main.kt +++ b/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/Main.kt @@ -82,6 +82,16 @@ class RunnerCli : CliktCommand(name = "runner") { .required() /** + * The auth domain to use. + */ + private val authAudience by option( + "--auth-audience", + help = "auth audience of the OpenDC API", + envvar = "AUTH0_AUDIENCE" + ) + .required() + + /** * The auth client ID to use. */ private val authClientId by option( @@ -231,7 +241,7 @@ class RunnerCli : CliktCommand(name = "runner") { override fun run(): Unit = runBlocking(Dispatchers.Default) { logger.info { "Starting OpenDC web runner" } - val client = ApiClient(baseUrl = apiUrl, AuthConfiguration(authDomain, authClientId, authClientSecret)) + val client = ApiClient(baseUrl = apiUrl, AuthConfiguration(authDomain, authClientId, authClientSecret), authAudience) val manager = ScenarioManager(client) logger.info { "Watching for queued scenarios" } |
