From 03c2686833f58c8cef0800f6addddbfc05f39b38 Mon Sep 17 00:00:00 2001 From: DJ Mountney Date: Fri, 9 Jan 2026 17:14:10 -0800 Subject: [PATCH 1/2] chore: Allow all the host ports and images to be configured --- on-prem/.env.example | 41 +++++++++++++++++-- on-prem/docker-compose.cache.yml | 30 +++++--------- on-prem/docker-compose.database.yml | 42 +++++++------------- on-prem/docker-compose.full.yml | 50 +++++++++--------------- on-prem/templates/compose.clickhouse.yml | 6 +-- on-prem/templates/compose.currents.yml | 26 ++++-------- on-prem/templates/compose.mongodb.yml | 6 +-- on-prem/templates/compose.redis.yml | 4 +- on-prem/templates/compose.rustfs.yml | 8 ++-- 9 files changed, 101 insertions(+), 112 deletions(-) diff --git a/on-prem/.env.example b/on-prem/.env.example index 53822ce..d1377f9 100644 --- a/on-prem/.env.example +++ b/on-prem/.env.example @@ -2,8 +2,16 @@ # Docker Compose Configuration # ============================================================================= # These variables are used by docker-compose only (not passed to containers) -# DC_IMAGE_REPOSITORY=513558712013.dkr.ecr.us-east-1.amazonaws.com/currents/on-prem/ -# DC_IMAGE_TAG=staging +# Currents application images +# DC_CURRENTS_IMAGE_REPOSITORY=513558712013.dkr.ecr.us-east-1.amazonaws.com/currents/on-prem/ +# DC_CURRENTS_IMAGE_TAG=staging +# +# Infrastructure service images (full image reference) +# DC_MONGODB_IMAGE=mongo:8.2.3 +# DC_REDIS_IMAGE=redis/redis-stack-server:7.4.0-v8 +# DC_CLICKHOUSE_IMAGE=clickhouse/clickhouse-server:25.8 +# DC_RUSTFS_IMAGE=rustfs/rustfs:1.0.0-alpha.79 +# DC_AWS_CLI_IMAGE=amazon/aws-cli:latest # ============================================================================= # Data Volume Configuration @@ -22,6 +30,33 @@ # DC_RUSTFS_VOLUME=./data/rustfs # DC_SCHEDULER_STARTUP_VOLUME=./data/startup +# ============================================================================= +# Port Configuration +# ============================================================================= +# Configure host ports for services. Format: [host_ip:]port +# Currents services default to all interfaces, databases default to localhost only +# +# DC_DIRECTOR_PORT=1234 # Director API (default: all interfaces) +# DC_API_PORT=4000 # Dashboard/API (default: all interfaces) +# DC_MONGODB_PORT=127.0.0.1:27017 # MongoDB (default: localhost only) +# DC_REDIS_PORT=127.0.0.1:6379 # Redis (default: localhost only) +# DC_CLICKHOUSE_HTTP_PORT=127.0.0.1:8123 # ClickHouse HTTP (default: localhost only) +# DC_CLICKHOUSE_TCP_PORT=127.0.0.1:9123 # ClickHouse TCP (default: localhost only) +# DC_RUSTFS_S3_PORT=9000 # RustFS S3 API (default: all interfaces) +# DC_RUSTFS_CONSOLE_PORT=9001 # RustFS Console (default: all interfaces) + +# ============================================================================= +# URL Configuration +# ============================================================================= +# Base URLs for the application +APP_BASE_URL=http://localhost:4000 +CURRENTS_RECORD_API_URL=http://localhost:1234 + +# Derived URLs (built from base URLs) +API_URL=${APP_BASE_URL}/v1 +DASHBOARD_URL=${APP_BASE_URL} +AUTOMATED_REPORTS_CURRENTS_DASHBOARD_HOSTNAME=${APP_BASE_URL} + # ============================================================================= # Redis Configuration # ============================================================================= @@ -77,7 +112,7 @@ JWT_SECRET_EXPIRY=10m # ============================================================================= # GitLab Integration # ============================================================================= -GITLAB_REDIRECT_URL=http://localhost:4000/integrations/gitlab/callback +GITLAB_REDIRECT_URL=${APP_BASE_URL}/integrations/gitlab/callback # Run `./scripts/generate-secrets key gitlab-key.pem` # Then `base64 < "gitlab-key.pem" | tr -d '\n'` to get the base64 secret to set here GITLAB_STATE_SECRET= diff --git a/on-prem/docker-compose.cache.yml b/on-prem/docker-compose.cache.yml index 4944bf6..ac93bde 100644 --- a/on-prem/docker-compose.cache.yml +++ b/on-prem/docker-compose.cache.yml @@ -11,11 +11,9 @@ services: # Currents services depend on redis director: hostname: director - image: ${DC_IMAGE_REPOSITORY:-currents-}director:${DC_IMAGE_TAG:-dev} - expose: - - 1234 + image: ${DC_CURRENTS_IMAGE_REPOSITORY:-currents-}director:${DC_CURRENTS_IMAGE_TAG:-dev} ports: - - 1234:1234 + - ${DC_DIRECTOR_PORT:-1234}:1234 restart: unless-stopped env_file: - .env @@ -23,19 +21,15 @@ services: - default environment: - CURRENTS_ENV=onprem - - API_URL="http://localhost:4000/v1" - - APP_BASE_URL=http://localhost:4000 depends_on: redis: condition: service_started required: false api: hostname: api - image: ${DC_IMAGE_REPOSITORY:-currents-}api:${DC_IMAGE_TAG:-dev} - expose: - - 4000 + image: ${DC_CURRENTS_IMAGE_REPOSITORY:-currents-}api:${DC_CURRENTS_IMAGE_TAG:-dev} ports: - - 4000:4000 + - ${DC_API_PORT:-4000}:4000 restart: unless-stopped networks: - default @@ -45,14 +39,12 @@ services: - CURRENTS_ENV=onprem - INCLUDE_DASHBOARD=onprem - CLICKHOUSE_PASSWORD=${CLICKHOUSE_CURRENTS_PASSWORD} - - AUTOMATED_REPORTS_CURRENTS_DASHBOARD_HOSTNAME=http://host.docker.internal:4000 - - CURRENTS_RECORD_API_URL=http://localhost:1234 depends_on: redis: condition: service_started required: false changestreams-worker: - image: ${DC_IMAGE_REPOSITORY:-currents-}change-streams:${DC_IMAGE_TAG:-dev} + image: ${DC_CURRENTS_IMAGE_REPOSITORY:-currents-}change-streams:${DC_CURRENTS_IMAGE_TAG:-dev} restart: unless-stopped networks: - default @@ -66,7 +58,7 @@ services: condition: service_started required: false write-worker: - image: ${DC_IMAGE_REPOSITORY:-currents-}writer:${DC_IMAGE_TAG:-dev} + image: ${DC_CURRENTS_IMAGE_REPOSITORY:-currents-}writer:${DC_CURRENTS_IMAGE_TAG:-dev} restart: unless-stopped networks: - default @@ -74,14 +66,13 @@ services: - .env environment: - CURRENTS_ENV=onprem - - AUTOMATED_REPORTS_CURRENTS_DASHBOARD_HOSTNAME=http://host.docker.internal:4000 - CLICKHOUSE_PASSWORD=${CLICKHOUSE_CURRENTS_PASSWORD} depends_on: redis: condition: service_started required: false scheduler: - image: ${DC_IMAGE_REPOSITORY:-currents-}scheduler:${DC_IMAGE_TAG:-dev} + image: ${DC_CURRENTS_IMAGE_REPOSITORY:-currents-}scheduler:${DC_CURRENTS_IMAGE_TAG:-dev} restart: unless-stopped networks: - default @@ -98,7 +89,7 @@ services: condition: service_started required: false webhooks: - image: ${DC_IMAGE_REPOSITORY:-currents-}webhooks:${DC_IMAGE_TAG:-dev} + image: ${DC_CURRENTS_IMAGE_REPOSITORY:-currents-}webhooks:${DC_CURRENTS_IMAGE_TAG:-dev} restart: unless-stopped networks: - default @@ -106,16 +97,15 @@ services: - .env environment: - CURRENTS_ENV=onprem - - DASHBOARD_URL=http://localhost:4000 depends_on: redis: condition: service_started required: false redis: hostname: redis - image: redis/redis-stack-server:7.4.0-v8 + image: ${DC_REDIS_IMAGE:-redis/redis-stack-server:7.4.0-v8} ports: - - 6379:6379 + - ${DC_REDIS_PORT:-127.0.0.1:6379}:6379 restart: unless-stopped networks: - default diff --git a/on-prem/docker-compose.database.yml b/on-prem/docker-compose.database.yml index 5ecd837..4f7f6fe 100644 --- a/on-prem/docker-compose.database.yml +++ b/on-prem/docker-compose.database.yml @@ -11,11 +11,9 @@ services: # Currents services depend on redis director: hostname: director - image: ${DC_IMAGE_REPOSITORY:-currents-}director:${DC_IMAGE_TAG:-dev} - expose: - - 1234 + image: ${DC_CURRENTS_IMAGE_REPOSITORY:-currents-}director:${DC_CURRENTS_IMAGE_TAG:-dev} ports: - - 1234:1234 + - ${DC_DIRECTOR_PORT:-1234}:1234 restart: unless-stopped env_file: - .env @@ -23,8 +21,6 @@ services: - default environment: - CURRENTS_ENV=onprem - - API_URL="http://localhost:4000/v1" - - APP_BASE_URL=http://localhost:4000 depends_on: clickhouse: condition: service_healthy @@ -37,11 +33,9 @@ services: required: false api: hostname: api - image: ${DC_IMAGE_REPOSITORY:-currents-}api:${DC_IMAGE_TAG:-dev} - expose: - - 4000 + image: ${DC_CURRENTS_IMAGE_REPOSITORY:-currents-}api:${DC_CURRENTS_IMAGE_TAG:-dev} ports: - - 4000:4000 + - ${DC_API_PORT:-4000}:4000 restart: unless-stopped networks: - default @@ -51,8 +45,6 @@ services: - CURRENTS_ENV=onprem - INCLUDE_DASHBOARD=onprem - CLICKHOUSE_PASSWORD=${CLICKHOUSE_CURRENTS_PASSWORD} - - AUTOMATED_REPORTS_CURRENTS_DASHBOARD_HOSTNAME=http://host.docker.internal:4000 - - CURRENTS_RECORD_API_URL=http://localhost:1234 depends_on: clickhouse: condition: service_healthy @@ -64,7 +56,7 @@ services: condition: service_started required: false changestreams-worker: - image: ${DC_IMAGE_REPOSITORY:-currents-}change-streams:${DC_IMAGE_TAG:-dev} + image: ${DC_CURRENTS_IMAGE_REPOSITORY:-currents-}change-streams:${DC_CURRENTS_IMAGE_TAG:-dev} restart: unless-stopped networks: - default @@ -84,7 +76,7 @@ services: condition: service_started required: false write-worker: - image: ${DC_IMAGE_REPOSITORY:-currents-}writer:${DC_IMAGE_TAG:-dev} + image: ${DC_CURRENTS_IMAGE_REPOSITORY:-currents-}writer:${DC_CURRENTS_IMAGE_TAG:-dev} restart: unless-stopped networks: - default @@ -92,7 +84,6 @@ services: - .env environment: - CURRENTS_ENV=onprem - - AUTOMATED_REPORTS_CURRENTS_DASHBOARD_HOSTNAME=http://host.docker.internal:4000 - CLICKHOUSE_PASSWORD=${CLICKHOUSE_CURRENTS_PASSWORD} depends_on: clickhouse: @@ -105,7 +96,7 @@ services: condition: service_started required: false scheduler: - image: ${DC_IMAGE_REPOSITORY:-currents-}scheduler:${DC_IMAGE_TAG:-dev} + image: ${DC_CURRENTS_IMAGE_REPOSITORY:-currents-}scheduler:${DC_CURRENTS_IMAGE_TAG:-dev} restart: unless-stopped networks: - default @@ -128,7 +119,7 @@ services: condition: service_started required: false webhooks: - image: ${DC_IMAGE_REPOSITORY:-currents-}webhooks:${DC_IMAGE_TAG:-dev} + image: ${DC_CURRENTS_IMAGE_REPOSITORY:-currents-}webhooks:${DC_CURRENTS_IMAGE_TAG:-dev} restart: unless-stopped networks: - default @@ -136,7 +127,6 @@ services: - .env environment: - CURRENTS_ENV=onprem - - DASHBOARD_URL=http://localhost:4000 depends_on: clickhouse: condition: service_healthy @@ -149,7 +139,7 @@ services: required: false clickhouse: hostname: clickhouse - image: clickhouse/clickhouse-server:25.8 + image: ${DC_CLICKHOUSE_IMAGE:-clickhouse/clickhouse-server:25.8} restart: unless-stopped environment: CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT: '1' @@ -163,8 +153,8 @@ services: env_file: - .env ports: - - 8123:8123 # HTTP Interface - - 9123:9000 # TCP Interface + - ${DC_CLICKHOUSE_HTTP_PORT:-127.0.0.1:8123}:8123 # HTTP Interface + - ${DC_CLICKHOUSE_TCP_PORT:-127.0.0.1:9123}:9000 # TCP Interface networks: - default configs: @@ -174,11 +164,9 @@ services: - ${DC_CLICKHOUSE_VOLUME:-./data/clickhouse}:/var/lib/clickhouse mongodb: hostname: mongodb - image: mongo:8.2.3 - expose: - - 27017 + image: ${DC_MONGODB_IMAGE:-mongo:8.2.3} ports: - - 27017:27017 + - ${DC_MONGODB_PORT:-127.0.0.1:27017}:27017 restart: unless-stopped entrypoint: - bash @@ -232,9 +220,9 @@ services: - ${DC_MONGODB_VOLUME:-./data/mongodb}:/data/db redis: hostname: redis - image: redis/redis-stack-server:7.4.0-v8 + image: ${DC_REDIS_IMAGE:-redis/redis-stack-server:7.4.0-v8} ports: - - 6379:6379 + - ${DC_REDIS_PORT:-127.0.0.1:6379}:6379 restart: unless-stopped networks: - default diff --git a/on-prem/docker-compose.full.yml b/on-prem/docker-compose.full.yml index b94e3c0..ea1c02e 100644 --- a/on-prem/docker-compose.full.yml +++ b/on-prem/docker-compose.full.yml @@ -11,11 +11,9 @@ services: # Currents services depend on redis director: hostname: director - image: ${DC_IMAGE_REPOSITORY:-currents-}director:${DC_IMAGE_TAG:-dev} - expose: - - 1234 + image: ${DC_CURRENTS_IMAGE_REPOSITORY:-currents-}director:${DC_CURRENTS_IMAGE_TAG:-dev} ports: - - 1234:1234 + - ${DC_DIRECTOR_PORT:-1234}:1234 restart: unless-stopped env_file: - .env @@ -23,8 +21,6 @@ services: - default environment: - CURRENTS_ENV=onprem - - API_URL="http://localhost:4000/v1" - - APP_BASE_URL=http://localhost:4000 depends_on: clickhouse: condition: service_healthy @@ -37,11 +33,9 @@ services: required: false api: hostname: api - image: ${DC_IMAGE_REPOSITORY:-currents-}api:${DC_IMAGE_TAG:-dev} - expose: - - 4000 + image: ${DC_CURRENTS_IMAGE_REPOSITORY:-currents-}api:${DC_CURRENTS_IMAGE_TAG:-dev} ports: - - 4000:4000 + - ${DC_API_PORT:-4000}:4000 restart: unless-stopped networks: - default @@ -51,8 +45,6 @@ services: - CURRENTS_ENV=onprem - INCLUDE_DASHBOARD=onprem - CLICKHOUSE_PASSWORD=${CLICKHOUSE_CURRENTS_PASSWORD} - - AUTOMATED_REPORTS_CURRENTS_DASHBOARD_HOSTNAME=http://host.docker.internal:4000 - - CURRENTS_RECORD_API_URL=http://localhost:1234 depends_on: clickhouse: condition: service_healthy @@ -64,7 +56,7 @@ services: condition: service_started required: false changestreams-worker: - image: ${DC_IMAGE_REPOSITORY:-currents-}change-streams:${DC_IMAGE_TAG:-dev} + image: ${DC_CURRENTS_IMAGE_REPOSITORY:-currents-}change-streams:${DC_CURRENTS_IMAGE_TAG:-dev} restart: unless-stopped networks: - default @@ -84,7 +76,7 @@ services: condition: service_started required: false write-worker: - image: ${DC_IMAGE_REPOSITORY:-currents-}writer:${DC_IMAGE_TAG:-dev} + image: ${DC_CURRENTS_IMAGE_REPOSITORY:-currents-}writer:${DC_CURRENTS_IMAGE_TAG:-dev} restart: unless-stopped networks: - default @@ -92,7 +84,6 @@ services: - .env environment: - CURRENTS_ENV=onprem - - AUTOMATED_REPORTS_CURRENTS_DASHBOARD_HOSTNAME=http://host.docker.internal:4000 - CLICKHOUSE_PASSWORD=${CLICKHOUSE_CURRENTS_PASSWORD} depends_on: clickhouse: @@ -105,7 +96,7 @@ services: condition: service_started required: false scheduler: - image: ${DC_IMAGE_REPOSITORY:-currents-}scheduler:${DC_IMAGE_TAG:-dev} + image: ${DC_CURRENTS_IMAGE_REPOSITORY:-currents-}scheduler:${DC_CURRENTS_IMAGE_TAG:-dev} restart: unless-stopped networks: - default @@ -128,7 +119,7 @@ services: condition: service_started required: false webhooks: - image: ${DC_IMAGE_REPOSITORY:-currents-}webhooks:${DC_IMAGE_TAG:-dev} + image: ${DC_CURRENTS_IMAGE_REPOSITORY:-currents-}webhooks:${DC_CURRENTS_IMAGE_TAG:-dev} restart: unless-stopped networks: - default @@ -136,7 +127,6 @@ services: - .env environment: - CURRENTS_ENV=onprem - - DASHBOARD_URL=http://localhost:4000 depends_on: clickhouse: condition: service_healthy @@ -149,7 +139,7 @@ services: required: false clickhouse: hostname: clickhouse - image: clickhouse/clickhouse-server:25.8 + image: ${DC_CLICKHOUSE_IMAGE:-clickhouse/clickhouse-server:25.8} restart: unless-stopped environment: CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT: '1' @@ -163,8 +153,8 @@ services: env_file: - .env ports: - - 8123:8123 # HTTP Interface - - 9123:9000 # TCP Interface + - ${DC_CLICKHOUSE_HTTP_PORT:-127.0.0.1:8123}:8123 # HTTP Interface + - ${DC_CLICKHOUSE_TCP_PORT:-127.0.0.1:9123}:9000 # TCP Interface networks: - default configs: @@ -174,11 +164,9 @@ services: - ${DC_CLICKHOUSE_VOLUME:-./data/clickhouse}:/var/lib/clickhouse mongodb: hostname: mongodb - image: mongo:8.2.3 - expose: - - 27017 + image: ${DC_MONGODB_IMAGE:-mongo:8.2.3} ports: - - 27017:27017 + - ${DC_MONGODB_PORT:-127.0.0.1:27017}:27017 restart: unless-stopped entrypoint: - bash @@ -232,9 +220,9 @@ services: - ${DC_MONGODB_VOLUME:-./data/mongodb}:/data/db redis: hostname: redis - image: redis/redis-stack-server:7.4.0-v8 + image: ${DC_REDIS_IMAGE:-redis/redis-stack-server:7.4.0-v8} ports: - - 6379:6379 + - ${DC_REDIS_PORT:-127.0.0.1:6379}:6379 restart: unless-stopped networks: - default @@ -242,10 +230,10 @@ services: - ${DC_REDIS_VOLUME:-./data/redis}:/data rustfs: hostname: rustfs - image: rustfs/rustfs:1.0.0-alpha.79 + image: ${DC_RUSTFS_IMAGE:-rustfs/rustfs:1.0.0-alpha.79} ports: - - 9000:9000 # S3 API port - - 9001:9001 # Web console port + - ${DC_RUSTFS_S3_PORT:-9000}:9000 # S3 API port + - ${DC_RUSTFS_CONSOLE_PORT:-9001}:9001 # Web console port environment: RUSTFS_CONSOLE_ENABLE: "true" RUSTFS_ACCESS_KEY: ${RUSTFS_ACCESS_KEY} @@ -262,7 +250,7 @@ services: timeout: 5s retries: 10 rustfs-init: - image: amazon/aws-cli:latest + image: ${DC_AWS_CLI_IMAGE:-amazon/aws-cli:latest} depends_on: rustfs: condition: service_healthy diff --git a/on-prem/templates/compose.clickhouse.yml b/on-prem/templates/compose.clickhouse.yml index 7d1e591..5b1080f 100644 --- a/on-prem/templates/compose.clickhouse.yml +++ b/on-prem/templates/compose.clickhouse.yml @@ -33,7 +33,7 @@ configs: services: clickhouse: hostname: clickhouse - image: clickhouse/clickhouse-server:25.8 + image: ${DC_CLICKHOUSE_IMAGE:-clickhouse/clickhouse-server:25.8} restart: unless-stopped environment: CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT: '1' @@ -47,8 +47,8 @@ services: env_file: - .env ports: - - 8123:8123 # HTTP Interface - - 9123:9000 # TCP Interface + - ${DC_CLICKHOUSE_HTTP_PORT:-127.0.0.1:8123}:8123 # HTTP Interface + - ${DC_CLICKHOUSE_TCP_PORT:-127.0.0.1:9123}:9000 # TCP Interface networks: - default configs: diff --git a/on-prem/templates/compose.currents.yml b/on-prem/templates/compose.currents.yml index 53d4c88..0b92364 100644 --- a/on-prem/templates/compose.currents.yml +++ b/on-prem/templates/compose.currents.yml @@ -3,11 +3,9 @@ services: director: hostname: director - image: ${DC_IMAGE_REPOSITORY:-currents-}director:${DC_IMAGE_TAG:-dev} - expose: - - 1234 + image: ${DC_CURRENTS_IMAGE_REPOSITORY:-currents-}director:${DC_CURRENTS_IMAGE_TAG:-dev} ports: - - 1234:1234 + - ${DC_DIRECTOR_PORT:-1234}:1234 restart: unless-stopped env_file: - .env @@ -15,16 +13,12 @@ services: - default environment: - CURRENTS_ENV=onprem - - API_URL="http://localhost:4000/v1" - - APP_BASE_URL=http://localhost:4000 api: hostname: api - image: ${DC_IMAGE_REPOSITORY:-currents-}api:${DC_IMAGE_TAG:-dev} - expose: - - 4000 + image: ${DC_CURRENTS_IMAGE_REPOSITORY:-currents-}api:${DC_CURRENTS_IMAGE_TAG:-dev} ports: - - 4000:4000 + - ${DC_API_PORT:-4000}:4000 restart: unless-stopped networks: - default @@ -34,11 +28,9 @@ services: - CURRENTS_ENV=onprem - INCLUDE_DASHBOARD=onprem - CLICKHOUSE_PASSWORD=${CLICKHOUSE_CURRENTS_PASSWORD} - - AUTOMATED_REPORTS_CURRENTS_DASHBOARD_HOSTNAME=http://host.docker.internal:4000 - - CURRENTS_RECORD_API_URL=http://localhost:1234 changestreams-worker: - image: ${DC_IMAGE_REPOSITORY:-currents-}change-streams:${DC_IMAGE_TAG:-dev} + image: ${DC_CURRENTS_IMAGE_REPOSITORY:-currents-}change-streams:${DC_CURRENTS_IMAGE_TAG:-dev} restart: unless-stopped networks: - default @@ -49,7 +41,7 @@ services: - CLICKHOUSE_PASSWORD=${CLICKHOUSE_CURRENTS_PASSWORD} write-worker: - image: ${DC_IMAGE_REPOSITORY:-currents-}writer:${DC_IMAGE_TAG:-dev} + image: ${DC_CURRENTS_IMAGE_REPOSITORY:-currents-}writer:${DC_CURRENTS_IMAGE_TAG:-dev} restart: unless-stopped networks: - default @@ -57,11 +49,10 @@ services: - .env environment: - CURRENTS_ENV=onprem - - AUTOMATED_REPORTS_CURRENTS_DASHBOARD_HOSTNAME=http://host.docker.internal:4000 - CLICKHOUSE_PASSWORD=${CLICKHOUSE_CURRENTS_PASSWORD} scheduler: - image: ${DC_IMAGE_REPOSITORY:-currents-}scheduler:${DC_IMAGE_TAG:-dev} + image: ${DC_CURRENTS_IMAGE_REPOSITORY:-currents-}scheduler:${DC_CURRENTS_IMAGE_TAG:-dev} restart: unless-stopped networks: - default @@ -75,7 +66,7 @@ services: - ${DC_SCHEDULER_STARTUP_VOLUME:-./data/startup}:/app/packages/scheduler/dist/.startup webhooks: - image: ${DC_IMAGE_REPOSITORY:-currents-}webhooks:${DC_IMAGE_TAG:-dev} + image: ${DC_CURRENTS_IMAGE_REPOSITORY:-currents-}webhooks:${DC_CURRENTS_IMAGE_TAG:-dev} restart: unless-stopped networks: - default @@ -83,7 +74,6 @@ services: - .env environment: - CURRENTS_ENV=onprem - - DASHBOARD_URL=http://localhost:4000 networks: default: null diff --git a/on-prem/templates/compose.mongodb.yml b/on-prem/templates/compose.mongodb.yml index a7b97a4..1a9c0e4 100644 --- a/on-prem/templates/compose.mongodb.yml +++ b/on-prem/templates/compose.mongodb.yml @@ -4,11 +4,9 @@ services: mongodb: hostname: mongodb - image: mongo:8.2.3 - expose: - - 27017 + image: ${DC_MONGODB_IMAGE:-mongo:8.2.3} ports: - - 27017:27017 + - ${DC_MONGODB_PORT:-127.0.0.1:27017}:27017 restart: unless-stopped entrypoint: - bash diff --git a/on-prem/templates/compose.redis.yml b/on-prem/templates/compose.redis.yml index 4f40ac0..6bb34fa 100644 --- a/on-prem/templates/compose.redis.yml +++ b/on-prem/templates/compose.redis.yml @@ -4,9 +4,9 @@ services: redis: hostname: redis - image: redis/redis-stack-server:7.4.0-v8 + image: ${DC_REDIS_IMAGE:-redis/redis-stack-server:7.4.0-v8} ports: - - 6379:6379 + - ${DC_REDIS_PORT:-127.0.0.1:6379}:6379 restart: unless-stopped networks: - default diff --git a/on-prem/templates/compose.rustfs.yml b/on-prem/templates/compose.rustfs.yml index 54e39d5..a397847 100644 --- a/on-prem/templates/compose.rustfs.yml +++ b/on-prem/templates/compose.rustfs.yml @@ -4,10 +4,10 @@ services: rustfs: hostname: rustfs - image: rustfs/rustfs:1.0.0-alpha.79 + image: ${DC_RUSTFS_IMAGE:-rustfs/rustfs:1.0.0-alpha.79} ports: - - 9000:9000 # S3 API port - - 9001:9001 # Web console port + - ${DC_RUSTFS_S3_PORT:-9000}:9000 # S3 API port + - ${DC_RUSTFS_CONSOLE_PORT:-9001}:9001 # Web console port environment: RUSTFS_CONSOLE_ENABLE: "true" RUSTFS_ACCESS_KEY: ${RUSTFS_ACCESS_KEY} @@ -25,7 +25,7 @@ services: retries: 10 rustfs-init: - image: amazon/aws-cli:latest + image: ${DC_AWS_CLI_IMAGE:-amazon/aws-cli:2.32.31} depends_on: rustfs: condition: service_healthy From 541e183d7ac5042959c53195caf35062e0d32775 Mon Sep 17 00:00:00 2001 From: DJ Mountney Date: Fri, 9 Jan 2026 17:15:33 -0800 Subject: [PATCH 2/2] chore: sync images --- on-prem/docker-compose.full.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/on-prem/docker-compose.full.yml b/on-prem/docker-compose.full.yml index ea1c02e..04fca8b 100644 --- a/on-prem/docker-compose.full.yml +++ b/on-prem/docker-compose.full.yml @@ -250,7 +250,7 @@ services: timeout: 5s retries: 10 rustfs-init: - image: ${DC_AWS_CLI_IMAGE:-amazon/aws-cli:latest} + image: ${DC_AWS_CLI_IMAGE:-amazon/aws-cli:2.32.31} depends_on: rustfs: condition: service_healthy