Improve Conductor dev workflow (#109)

diff --git a/.conductor/settings.toml b/.conductor/settings.toml
index eda2c10ed16d352fdf7942cc1d93663e6f0bda84..c543973c6bbf661750e80d9dac15331f54daae91 100644 (file)
--- a/.conductor/settings.toml
+++ b/.conductor/settings.toml
@@ -1,16 +1,39 @@
-#:schema https://conductor.build/schemas/settings.repo.schema.json
+"$schema" = "https://conductor.build/schemas/settings.repo.schema.json"
+
+file_include_globs = ".env\n.env.local\n.env.*.local\nconfig.yaml\n"
 
 [scripts]
 setup = """
+set -e
+
 bun install
+
 if [ ! -f config.yaml ]; then
-  sed 's/port: 3000/port: ${CONDUCTOR_PORT:-3000}/' config.example.yaml > config.yaml
+  cp config.example.yaml config.yaml
 fi
+
+tmp="$(mktemp)"
+sed \
+  -e 's/^  port: 3000$/  port: ${PASTEGUARD_PORT:-3000}/' \
+  -e 's/^  port: ${CONDUCTOR_PORT:-3000}$/  port: ${PASTEGUARD_PORT:-3000}/' \
+  config.yaml > "$tmp"
+mv "$tmp" config.yaml
+
 mkdir -p data
 """
 run = """
-docker compose -p pasteguard-dev --profile dev up detector -d
-CONDUCTOR_PORT=${CONDUCTOR_PORT:-3000} bun run dev
+set -e
+
+PORT="${CONDUCTOR_PORT:-3000}"
+export PASTEGUARD_PORT="$PORT"
+export PASTEGUARD_DETECTOR_PORT="$((PORT + 1))"
+export DETECTOR_URL="http://localhost:${PASTEGUARD_DETECTOR_PORT}"
+
+docker compose -p "pasteguard-${PORT}" --profile dev up detector -d
+bun run dev
+"""
+archive = """
+PORT="${CONDUCTOR_PORT:-3000}"
+docker compose -p "pasteguard-${PORT}" --profile dev down --remove-orphans || true
 """
-archive = "true"
 run_mode = "concurrent"

diff --git a/docker-compose.yml b/docker-compose.yml
index dd9f0d3bfce82ceb6cd0caa0201d8bb8d066295e..c88784162f3e1ba76554db1a0bf60d8c196715aa 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,7 +19,7 @@ services:
       context: .
       dockerfile: docker/Dockerfile
     ports:
-      - "3000:3000"
+      - "${PASTEGUARD_PORT:-3000}:3000"
     env_file:
       - path: .env
         required: false
@@ -38,5 +38,5 @@ services:
       dockerfile: docker/Dockerfile
       target: detector
     ports:
-      - "5002:5002"
+      - "${PASTEGUARD_DETECTOR_PORT:-5002}:5002"
     restart: unless-stopped