From e78f6c7f2859ba897d66d7bb40c832e5ff5d3e60 Mon Sep 17 00:00:00 2001 From: Iulian Barbu <14218860+iulianbarbu@users.noreply.github.com> Date: Tue, 26 Sep 2023 11:43:53 +0300 Subject: [PATCH] fix(docker-compose.dev): adjust auth dev dependency (#1274) --- DEVELOPING.md | 2 +- deployer/src/args.rs | 2 +- docker-compose.dev.yml | 6 ++---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/DEVELOPING.md b/DEVELOPING.md index 7bbd5994c5..024cccc9c2 100644 --- a/DEVELOPING.md +++ b/DEVELOPING.md @@ -237,7 +237,7 @@ Make sure an admin user is inserted into auth and that the key is used by cargo- We're now ready to start a local run of the deployer: ```bash -OTLP_ADDRESS=http://127.0.0.1:4317 cargo run -p shuttle-deployer -- --provisioner-address http://localhost:3000 --auth-uri http://localhost:8008 --resource-recorder http://localhost:8007 --logger-uri http://localhost:8080 --builder-uri http://localhost:8009 --proxy-fqdn local.rs --admin-secret dh9z58jttoes3qvt --local --project-id "01H7WHDK23XYGSESCBG6XWJ1V0" --project +OTLP_ADDRESS=http://127.0.0.1:4317 cargo run -p shuttle-deployer -- --provisioner-address http://localhost:3000 --auth-uri http://localhost:8008 --resource-recorder http://localhost:8007 --builder-uri http://localhost:8009 --logger-uri http://localhost:8010 --proxy-fqdn local.rs --admin-secret dh9z58jttoes3qvt --local --project-id "01H7WHDK23XYGSESCBG6XWJ1V0" --project ``` The `` needs to match the name of the project that will be deployed to this deployer. diff --git a/deployer/src/args.rs b/deployer/src/args.rs index 3d35f4f32a..14861b356d 100644 --- a/deployer/src/args.rs +++ b/deployer/src/args.rs @@ -56,7 +56,7 @@ pub struct Args { pub admin_secret: String, /// Address to reach the authentication service at - #[clap(long, default_value = "http://127.0.0.1:8008")] + #[clap(long, default_value = "http://auth:8000")] pub auth_uri: Uri, /// Address to reach the builder service at diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 9df0fa2c62..f4b78941a7 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -45,9 +45,7 @@ services: >&2 echo "The control DB is available - starting shuttle-resource-recorder" exec /usr/local/bin/service "$${@:0}" - auth-dev: - ports: - - 8006:8000 + auth: depends_on: - control-db entrypoint: @@ -74,7 +72,7 @@ services: - panamax logger: ports: - - 8080:8000 + - 8010:8000 depends_on: - auth - logger-postgres