Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 2 deletions .env.broker-template
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

RUST_LOG=info

REDIS_HOST=redis
REDIS_IMG=redis:7.2.5-alpine3.19
VALKEY_HOST=valkey
VALKEY_IMG=valkey/valkey:9.0.0

POSTGRES_HOST=postgres
POSTGRES_IMG=postgres:16.3-bullseye
Expand Down
1 change: 1 addition & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"rust-analyzer.check.extraArgs": ["--target-dir=target/analyzer"],
"rust-analyzer.linkedProjects": [
"./Cargo.toml",
"./bento/Cargo.toml",
"./crates/boundless-cli/Cargo.toml",
"./crates/broker/Cargo.toml",
// "./crates/guest/assessor/assessor-guest/Cargo.toml",
Expand Down
22 changes: 11 additions & 11 deletions compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: bento
# Anchors:
x-base-environment: &base-environment
DATABASE_URL: postgresql://${POSTGRES_USER:-worker}:${POSTGRES_PASSWORD:-password}@${POSTGRES_HOST:-postgres}:${POSTGRES_PORT:-5432}/${POSTGRES_DB:-taskdb}
REDIS_URL: redis://${REDIS_HOST:-redis}:6379
VALKEY_URL: redis://${VALKEY_HOST:-valkey}:6379
S3_URL: http://${MINIO_HOST:-minio}:9000
S3_BUCKET: ${MINIO_BUCKET:-workflow}
S3_ACCESS_KEY: ${MINIO_ROOT_USER:-admin}
Expand All @@ -22,7 +22,7 @@ x-agent-common: &agent-common
depends_on:
postgres:
condition: service_healthy
redis:
valkey:
condition: service_healthy
minio:
condition: service_healthy
Expand Down Expand Up @@ -65,7 +65,7 @@ x-broker-common: &broker-common
condition: service_started
aux_agent:
condition: service_started
redis:
valkey:
condition: service_healthy
postgres:
condition: service_healthy
Expand All @@ -81,17 +81,17 @@ x-broker-common: &broker-common
network_mode: host

services:
redis:
hostname: ${REDIS_HOST:-redis}
image: ${REDIS_IMG:-redis:7.2.5-alpine3.19}
valkey:
hostname: ${VALKEY_HOST:-valkey}
image: ${VALKEY_IMG:-valkey/valkey:9.0.0}
restart: always
ports:
- 6379:6379
volumes:
- redis-data:/data
command: redis-server --maxmemory-policy allkeys-lru --save 900 1 --appendonly yes
- valkey-data:/data
command: valkey-server --maxmemory-policy allkeys-lru --save 900 1 --appendonly yes
healthcheck:
test: ["CMD", "redis-cli", "ping"]
test: ["CMD", "valkey-cli", "ping"]
interval: 5s
timeout: 3s
retries: 5
Expand Down Expand Up @@ -164,7 +164,7 @@ services:
- broker-data:/db
depends_on:
- postgres
- redis
- valkey
- minio

exec_agent:
Expand Down Expand Up @@ -288,7 +288,7 @@ services:
entrypoint: /bin/bash -c "while sleep 1; do /app/bento_cli --iter-count 500000; done"

volumes:
redis-data:
valkey-data:
postgres-data:
minio-data:
grafana-data:
Expand Down
Loading