From 9504f46550015c7942371c30eca13a8c04e9e7e6 Mon Sep 17 00:00:00 2001 From: Meg Stepp Date: Thu, 14 Aug 2025 15:11:37 -0400 Subject: [PATCH 1/2] fix(dashboard): use env_file to read dashboard env first, then override with specific docker variables --- deployment/docker-compose.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/deployment/docker-compose.yaml b/deployment/docker-compose.yaml index 98314898b6..3b2bba38de 100644 --- a/deployment/docker-compose.yaml +++ b/deployment/docker-compose.yaml @@ -205,13 +205,13 @@ services: depends_on: - planetscale - agent + env_file: + - ../apps/dashboard/.env environment: # Database configuration DATABASE_HOST: "planetscale:3900" - DATABASE_USERNAME: "unkey" - DATABASE_PASSWORD: "password" # Auth configuration - AUTH_PROVIDER: "local" + # Reading from env file, no override necessary # Agent configuration AGENT_URL: "http://agent:8080" AGENT_TOKEN: "agent-auth-secret" @@ -220,8 +220,7 @@ services: # Environment NODE_ENV: "production" # Bootstrap workspace/API IDs - UNKEY_WORKSPACE_ID: "ws_local_root" - UNKEY_API_ID: "api_local_root_keys" + # Reading from env file, no override necessary # Unkey Deploy Services - All-in-one development container with all 4 services metald-aio: build: From ed5ba68685704acfe5fcf9afe5840fe4ad9b54c1 Mon Sep 17 00:00:00 2001 From: Meg Stepp Date: Thu, 14 Aug 2025 16:15:28 -0400 Subject: [PATCH 2/2] update CI workflows to create the .env file before docker compose runs --- .github/workflows/job_test_api_local.yaml | 4 ++++ .github/workflows/job_test_go_api_local.yaml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/.github/workflows/job_test_api_local.yaml b/.github/workflows/job_test_api_local.yaml index ee45e6a341..6677a22900 100644 --- a/.github/workflows/job_test_api_local.yaml +++ b/.github/workflows/job_test_api_local.yaml @@ -12,6 +12,10 @@ jobs: - uses: actions/checkout@v4 - name: Set up Docker Buildx uses: useblacksmith/setup-docker-builder@v1 + - name: Create dashboard env file for Docker Compose + run: | + mkdir -p ./apps/dashboard + touch ./apps/dashboard/.env - name: Run containers run: docker compose -f ./deployment/docker-compose.yaml up mysql redis clickhouse planetscale agent s3 apiv2 api -d --wait env: diff --git a/.github/workflows/job_test_go_api_local.yaml b/.github/workflows/job_test_go_api_local.yaml index a710a251a6..328624a0b7 100644 --- a/.github/workflows/job_test_go_api_local.yaml +++ b/.github/workflows/job_test_go_api_local.yaml @@ -9,6 +9,10 @@ jobs: runs-on: blacksmith-16vcpu-ubuntu-2404 steps: - uses: actions/checkout@v4 + - name: Create dashboard env file for Docker Compose + run: | + mkdir -p ./apps/dashboard + touch ./apps/dashboard/.env - name: Set up Docker Buildx uses: useblacksmith/setup-docker-builder@v1 - name: Setup Go