Skip to content

fix(dashboard): use env_file to read dashboard env first #3790

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mcstepp merged 3 commits into from
Aug 15, 2025
Merged

fix(dashboard): use env_file to read dashboard env first #3790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9504f46
fix(dashboard): use env_file to read dashboard env first, then overri…
mcstepp Aug 14, 2025
ed5ba68
update CI workflows to create the .env file before docker compose runs
mcstepp Aug 14, 2025
65772ad
Merge branch 'main' into improve-deploy-docker
mcstepp Aug 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/job_test_api_local.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/job_test_go_api_local.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 4 additions & 5 deletions deployment/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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:
Expand Down