Skip to content

docker-compose(-next).yml: Improve docker compose recipe #1771

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
nuclearcat merged 1 commit into from
Mar 2, 2026
Merged

docker-compose(-next).yml: Improve docker compose recipe #1771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 5 additions & 17 deletions docker-compose-next.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ services:
- dashboard-db-data:/var/lib/postgresql/data
networks:
- private
ports:
- "${DB_PORT:-5434}:5432"
healthcheck:
test: ["CMD-SHELL", "pg_isready -U ${DB_USER:-admin}"]
interval: 5s
Expand All @@ -40,8 +38,6 @@ services:
restart: always
networks:
- private
ports:
- 6379:6379

backend:
image: ${IMAGE_REGISTRY:-ghcr.io}/${IMAGE_OWNER:-kernelci}/${IMAGE_REPOSITORY:-dashboard}/dashboard-backend:${IMAGE_TAG:-latest}
Expand All @@ -63,12 +59,7 @@ services:
- private
- public
ports:
- target: 8000
published: 8000
protocol: tcp
- target: 8001
published: 8001
protocol: tcp
- 2001:2001
depends_on:
- redis

Expand All @@ -87,10 +78,11 @@ services:
- public
volumes:
- static-data:/data/static
- ${SSL_CHAIN_FILE:-/etc/letsencrypt/live/d.kernelci.org/fullchain.pem}:/etc/nginx/ssl/fullchain.pem
- ${SSL_KEY_FILE:-/etc/letsencrypt/live/d.kernelci.org/privkey.pem}:/etc/nginx/ssl/privkey.pem
Comment on lines +81 to +82
Copy link
Copy Markdown
Collaborator

@MarceloRobert MarceloRobert Mar 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: add a comment about these variables or they'll be undocumented

ports:
- target: 80
published: 80
protocol: tcp
- 80:80
- 443:443
env_file: .env
environment:
PROXY_TARGET: ${PROXY_TARGET:-http://backend:8000}
Expand All @@ -115,10 +107,6 @@ services:
networks:
- private
- public
ports:
- target: ${INGESTER_METRICS_PORT:-8002}
published: ${INGESTER_METRICS_PORT:-8002}
protocol: tcp
Comment on lines -118 to -121
Copy link
Copy Markdown
Collaborator

@MarceloRobert MarceloRobert Mar 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just to confirm: this, backend's port 8001 and pending_aggregations_processor's port 8003 (which is not here, seems like it needs rebasing) are the ports for the prometheus/grafana services, will they still work on production?

depends_on:
- redis
profiles: ["with_commands"]
Expand Down
82 changes: 29 additions & 53 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,20 @@ networks:
public:
private:

secrets:
postgres_password_secret:
file: ./backend/runtime/secrets/postgres_password_secret

services:
backend:
container_name: dashboard_backend_service
container_name: dashboard_backend_service_staging
build:
context: ./backend
volumes:
- backend-data:${BACKEND_VOLUME_DIR:-/volume_data}
env_file:
- .env.backend
- .env
networks:
- private
- public
ports:
- 8000:8000
restart: always
image: ${IMAGE_REGISTRY:-ghcr.io}/${IMAGE_REPOSITORY:-local}/dashboard-backend:${IMAGE_TAG:-latest}
environment:
Expand All @@ -38,30 +36,19 @@ services:
- --bind=0.0.0.0:8000
- --timeout=250
entrypoint: "./utils/docker/backend_entrypoint.sh"
secrets:
- postgres_password_secret
depends_on:
- redis
- dashboard_db
ports:
- target: 8000
published: 8000
protocol: tcp
mode: host
- target: 8001
published: 8001
protocol: tcp
mode: host

ingester:
container_name: dashboard_ingester_service
container_name: dashboard_ingester_service_staging
build:
context: ./backend
volumes:
- backend-data:${BACKEND_VOLUME_DIR:-/volume_data} # Directory of the tree names file and other data
- ${INGESTER_SPOOL_DIR}:/app/spool # Directory for ingester to monitor
env_file:
- .env.ingester
- .env
networks:
- private
- public
Expand All @@ -80,18 +67,15 @@ services:
depends_on:
- dashboard_db
ports:
- target: ${INGESTER_METRICS_PORT:-8002}
published: ${INGESTER_METRICS_PORT:-8002}
protocol: tcp
mode: host
- 8002:8002
profiles: ["with_commands"]

pending_aggregations_processor:
container_name: pending_aggregations_processor_service
container_name: pending_aggregations_processor_service_staging
build:
context: ./backend
env_file:
- .env.pending_aggregations
- .env
networks:
- private
- public
Expand All @@ -110,30 +94,23 @@ services:
depends_on:
- dashboard_db
ports:
- target: 8001
published: ${PENDING_AGGREGATIONS_METRICS_PORT:-8003}
protocol: tcp
mode: host
- 8003:8001
profiles: ["with_commands"]

dashboard_db:
image: postgres:17
env_file:
- .env.db
- .env
volumes:
- dashboard-db-data:/var/lib/postgresql/data
networks:
- private
ports:
- "${DB_PORT:-5434}:5432"

redis:
image: redis:8.0-M04-alpine
restart: always
networks:
- private
ports:
- 6379:6379

dashboard:
build:
Expand All @@ -143,21 +120,20 @@ services:
volumes:
- static-data:/data/static

proxy:
build: ./proxy
image: ${IMAGE_REGISTRY:-ghcr.io}/${IMAGE_REPOSITORY:-local}/dashboard-proxy:${IMAGE_TAG:-latest}
restart: always
depends_on:
- backend
- dashboard
networks:
- public
volumes:
- static-data:/data/static
ports:
- target: 80
published: 80
protocol: tcp
mode: host
env_file:
- .env.proxy
# proxy:
# build: ./proxy
# image: ${IMAGE_REGISTRY:-ghcr.io}/${IMAGE_REPOSITORY:-local}/dashboard-proxy:${IMAGE_TAG:-latest}
# restart: always
# depends_on:
# - backend
# - dashboard
# networks:
# - public
# volumes:
# - static-data:/data/static
# - /etc/letsencrypt/live/staging.dashboard.kernelci.org/fullchain.pem:/etc/nginx/ssl/fullchain.pem
# - /etc/letsencrypt/live/staging.dashboard.kernelci.org/privkey.pem:/etc/nginx/ssl/privkey.pem
# ports:
# - 9000:9000
Comment on lines +136 to +137
Copy link
Copy Markdown
Collaborator

@MarceloRobert MarceloRobert Mar 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: since you are going to comment this service, you could leave the port 80:80 on, so that we can uncomment on development and access the frontend on http://localhost/

# env_file:
# - .env