From efd0218383a696f294f4ed51a3ada54d8dcf9aff Mon Sep 17 00:00:00 2001 From: FTB_lag Date: Thu, 27 Jun 2024 21:45:59 +0300 Subject: [PATCH] chore: fix contributing docs and fix feature flags in docker compose (#5572) --- docker-compose.yml | 40 ++++++++++++++++++++-------------------- docs/CONTRIBUTING.md | 2 +- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index cd6204fff..99702ad5a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -96,12 +96,12 @@ services: # Seeds STATIC_SEEDS: "true" # Feature flags - FLOW_ACTIVITIES_ENABLED: "true" + FEATURE_FLOW_ACTIVITIES_ENABLED: "true" FEATURE_POLICY_CONDITIONS_ENABLED: "true" - MULTI_SITE_RESOURCES_ENABLED: "true" - SELF_HOSTED_RELAYS_ENABLED: "true" - IDP_SYNC_ENABLED: "true" - REST_API_ENABLED: "true" + FEATURE_MULTI_SITE_RESOURCES_ENABLED: "true" + FEATURE_SELF_HOSTED_RELAYS_ENABLED: "true" + FEATURE_IDP_SYNC_ENABLED: "true" + FEATURE_REST_API_ENABLED: "true" healthcheck: test: ["CMD-SHELL", "curl -f localhost:8080/healthz"] start_period: 10s @@ -165,12 +165,12 @@ services: # Seeds STATIC_SEEDS: "true" # Feature flags - FLOW_ACTIVITIES_ENABLED: "true" + FEATURE_FLOW_ACTIVITIES_ENABLED: "true" FEATURE_POLICY_CONDITIONS_ENABLED: "true" - MULTI_SITE_RESOURCES_ENABLED: "true" - SELF_HOSTED_RELAYS_ENABLED: "true" - IDP_SYNC_ENABLED: "true" - REST_API_ENABLED: "true" + FEATURE_MULTI_SITE_RESOURCES_ENABLED: "true" + FEATURE_SELF_HOSTED_RELAYS_ENABLED: "true" + FEATURE_IDP_SYNC_ENABLED: "true" + FEATURE_REST_API_ENABLED: "true" depends_on: vault: condition: "service_healthy" @@ -228,12 +228,12 @@ services: # Seeds STATIC_SEEDS: "true" # Feature flags - FLOW_ACTIVITIES_ENABLED: "true" + FEATURE_FLOW_ACTIVITIES_ENABLED: "true" FEATURE_POLICY_CONDITIONS_ENABLED: "true" - MULTI_SITE_RESOURCES_ENABLED: "true" - SELF_HOSTED_RELAYS_ENABLED: "true" - IDP_SYNC_ENABLED: "true" - REST_API_ENABLED: "true" + FEATURE_MULTI_SITE_RESOURCES_ENABLED: "true" + FEATURE_SELF_HOSTED_RELAYS_ENABLED: "true" + FEATURE_IDP_SYNC_ENABLED: "true" + FEATURE_REST_API_ENABLED: "true" healthcheck: test: ["CMD-SHELL", "curl -f localhost:4000/healthz"] start_period: 10s @@ -297,12 +297,12 @@ services: # Seeds STATIC_SEEDS: "true" # Feature flags - FLOW_ACTIVITIES_ENABLED: "true" + FEATURE_FLOW_ACTIVITIES_ENABLED: "true" FEATURE_POLICY_CONDITIONS_ENABLED: "true" - MULTI_SITE_RESOURCES_ENABLED: "true" - SELF_HOSTED_RELAYS_ENABLED: "true" - IDP_SYNC_ENABLED: "true" - REST_API_ENABLED: "true" + FEATURE_MULTI_SITE_RESOURCES_ENABLED: "true" + FEATURE_SELF_HOSTED_RELAYS_ENABLED: "true" + FEATURE_IDP_SYNC_ENABLED: "true" + FEATURE_REST_API_ENABLED: "true" depends_on: postgres: condition: "service_healthy" diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index 6d4b7d9ff..c1a456dda 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -131,7 +131,7 @@ docker compose run --rm elixir /bin/sh -c "cd apps/domain && mix ecto.create && Created accounts: c89bcc8c-9392-4dae-a40d-888aef6d28e0: Firezone Account -docker compose up -d api web vault gateway client relay +docker compose up -d api web vault gateway client relay-1 relay-2 ``` You should now be able to connect to `http://localhost:8080/`