diff --git a/.devcontainer/docker-compose-base.yml b/.devcontainer/docker-compose-base.yml index 4c788d57eb2..a8840017d6a 100644 --- a/.devcontainer/docker-compose-base.yml +++ b/.devcontainer/docker-compose-base.yml @@ -518,7 +518,11 @@ services: interval: 5s timeout: 10s retries: 25 - start_period: 30s + # long start_period to cover the initial cold `cargo run` compilation of + # harvest on a fresh checkout; failures during start_period don't count + # towards retries and a success flips it healthy immediately, so this + # costs nothing on warm starts + start_period: 1800s trustee1: profiles: ["full"] diff --git a/.devcontainer/scripts/config-cli.sh b/.devcontainer/scripts/config-cli.sh index 5645ad4f7c7..41dd949f24f 100755 --- a/.devcontainer/scripts/config-cli.sh +++ b/.devcontainer/scripts/config-cli.sh @@ -12,7 +12,7 @@ if [ -z "$SUPER_ADMIN_TENANT_ID" ] \ then echo "missing default environments for auto config" else - cli step config \ + step-cli step config \ --tenant-id "$SUPER_ADMIN_TENANT_ID" \ --endpoint-url "$HASURA_ENDPOINT" \ --keycloak-url "$KEYCLOAK_URL" \ diff --git a/packages/step-cli/rust-local-target/release/step-cli b/packages/step-cli/rust-local-target/release/step-cli index 79fdcfaf83b..28f96d10d44 100755 Binary files a/packages/step-cli/rust-local-target/release/step-cli and b/packages/step-cli/rust-local-target/release/step-cli differ