From 8a7455db6535fd82b38f578316ee9e9cdacccff9 Mon Sep 17 00:00:00 2001
From: Jason Woltje <jason@diversecanvas.com>
Date: Thu, 12 Mar 2026 21:05:30 -0500
Subject: [PATCH] fix: Jaeger image tag and remap PG/Valkey ports to avoid host
 conflicts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

jaegertracing/jaeger:2 is not a valid Docker Hub tag — pin to 2.6.0.
Remap PG to 5433 and Valkey to 6380 to avoid conflicts with existing
host containers (sage-postgres, mosaic-valkey on 5432/6379).
Ports are env-configurable via PG_HOST_PORT / VALKEY_HOST_PORT.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .env.example       | 12 ++++++++----
 docker-compose.yml |  6 +++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.env.example b/.env.example
index 3bac810..1d09d56 100644
--- a/.env.example
+++ b/.env.example
@@ -1,8 +1,12 @@
-# Database
-DATABASE_URL=postgresql://mosaic:mosaic@localhost:5432/mosaic
+# Database (port 5433 avoids conflict with host PostgreSQL)
+DATABASE_URL=postgresql://mosaic:mosaic@localhost:5433/mosaic
 
-# Valkey (Redis-compatible)
-VALKEY_URL=redis://localhost:6379
+# Valkey (Redis-compatible, port 6380 avoids conflict with host Redis/Valkey)
+VALKEY_URL=redis://localhost:6380
+
+# Docker Compose host port overrides (optional)
+# PG_HOST_PORT=5433
+# VALKEY_HOST_PORT=6380
 
 # OpenTelemetry
 OTEL_EXPORTER_OTLP_ENDPOINT=http://localhost:4318
diff --git a/docker-compose.yml b/docker-compose.yml
index 920be71..278d739 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ services:
   postgres:
     image: pgvector/pgvector:pg17
     ports:
-      - '5432:5432'
+      - '${PG_HOST_PORT:-5433}:5432'
     environment:
       POSTGRES_USER: mosaic
       POSTGRES_PASSWORD: mosaic
@@ -18,7 +18,7 @@ services:
   valkey:
     image: valkey/valkey:8-alpine
     ports:
-      - '6379:6379'
+      - '${VALKEY_HOST_PORT:-6380}:6379'
     volumes:
       - valkey_data:/data
     healthcheck:
@@ -39,7 +39,7 @@ services:
         condition: service_started
 
   jaeger:
-    image: jaegertracing/jaeger:2
+    image: jaegertracing/jaeger:2.6.0
     ports:
       - '16686:16686' # Jaeger UI
       - '4319:4317' # Jaeger OTLP gRPC (internal, collector forwards here)
-- 
2.49.1