mirror of
https://github.com/penpot/penpot.git
synced 2026-06-09 17:02:05 +00:00
16dc83616a
* 🐳 Split devenv compose for parallel workspaces Move shared services into an infra compose file and keep the main devenv container plus Valkey in a separate compose file driven by defaults.env. Parameterize host-side ports, container names, source path, and runtime env while keeping container-internal ports fixed for same-origin proxying. Make tmux startup idempotent, add attach-devenv for the live instance, move shared MinIO user setup to infra startup, and let exporter scripts load backend _env.local overrides. Co-authored-by: Codex <codex@openai.com> * 🐳 Run parallel devenv instances against shared infra Add support for running N parallel devenv instances under separate compose projects sharing Postgres, MinIO, mailer, and LDAP. Each instance has its own main container, Valkey, source checkout, tmux session, and host port range offset by 10000 (3449 -> 13449 -> 23449, etc.). ./manage.sh run-devenv-agentic --n-instances N reconciles the running set to exactly {ws0..ws(N-1)}: missing instances are created (workspace sync from the live repo via git ls-files + per-instance env-file generation under docker/devenv/instances/ + detached tmux startup), surplus instances are stopped highest-first via compose down (never -v), already-running instances are left untouched. ws0 binds the live repo at PWD; ws1+ are scratch clones under ~/.penpot/penpot_workspaces/. Backend workers (enable-backend-worker) are gated on PENPOT_BACKEND_WORKER in backend/scripts/_env; ws1+ overlays disable them so async-task notifications stay bound to a single Valkey Pub/Sub instance. Compose helpers wrap docker compose with env -i so per-instance overlay --env-file actually overrides defaults.env -- without the strip, the shell env from sourcing defaults.env at startup would shadow the overlay (Compose gives shell precedence over --env-file). Other: - Drop network aliases (- main, - redis); use container_name for cross-container DNS so multiple instances on the shared network don't fight over the same DNS name. - Pin volume names via name: (PENPOT_*_VOLUME) so volumes survive project renames; ws0 keeps the pre-existing physical names (penpotdev_*). - Remove cross-project depends_on from main.yml (postgres/minio-setup now live in penpotdev-infra); manage.sh ensure-infra-up docker-waits on the minio-setup one-shot. - Strict arg parsing in run-devenv / run-devenv-agentic; --n-instances 0 rejected. - Remove unused Host-matched server block from the Caddyfile. Memory mem:devenv/core and developer docs updated. Co-authored-by: Codex <codex@openai.com> * ✨ Document and stabilise the parallel-workspace CLI; wire AI agents Improve parallel-workspaces developer CLI, and add an opt-in layer that lets four AI coding agents (Claude Code, opencode, VS Code Copilot, OpenAI Codex CLI) drive a specific workspace through a single launcher command. Parallel-workspace semantics ---------------------------- each run-devenv-agentic call brings up one wsN; --ws N (integer; default 0) targets a specific workspace and auto-starts ws0 first when N>=1 so the worker invariant holds. --sync is forbidden on ws0 and re-seeds the workspace from the live repo for ws1+. Stop semantics mirror the start invariant -- ws0 is the last to stop, shared infra stops with it, --all walks every instance highest-first. The worker policy section explains why workers run only on ws0 (Postgres FOR UPDATE SKIP LOCKED is safe across many workers but the cron dedup primitive is best-effort, and :telemetry / :audit-log-archive are not idempotent). Per-instance Valkey Pub/Sub isolation, msgbus topology, and the "async task notifications miss ws1+ tabs" caveat are stated explicitly. The mem:prod-infra/core memory captures the same external-services and task-queue / Pub-Sub topology in agent-readable form, and mem:backend/core and mem:critical-info now cross-link it so backend work surfaces the horizontal-scaling constraints from the start. AI coding agent integration --------------------------- New top-level .devenv/ directory holds committed templates (templates/{claude-code,opencode,vscode}.json and templates/codex.toml, each with \${PENPOT_MCP_PORT} and \${SERENA_MCP_PORT} placeholders) plus committed shared entries (matching shared/* files for Playwright, the only workspace-independent server we ship today). ./manage.sh start-coding-agent <claude|opencode|vscode|codex> [--ws N] launches the chosen client against one workspace. It cd's into the target's directory (the live repo for ws0; workspace-path "wsN" for ws1+) and refuses to launch unless (a) the binary is on PATH, (b) the workspace directory exists for ws1+, and (c) the instance is up (devenv-main-running) -- the MCP servers only exist while the devenv is running. The agentic-devenv guide is restructured around this Quick start path, with a per-client table and a Manual configuration fallback for clients we don't cover. Co-Authored-By: Codex <codex@openai.com> Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * ♻️ Scope the shadow devtools to the dev build --------- Co-authored-by: Codex <codex@openai.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
70 lines
3.1 KiB
Bash
70 lines
3.1 KiB
Bash
# Single source of truth for instance-specific devenv configuration.
|
|
# Loaded by docker compose via --env-file and also sourced by manage.sh
|
|
# (see manage.sh). This is the ws0 baseline; for ws1+ manage.sh injects the
|
|
# per-instance values as environment variables (see instance-env-overrides),
|
|
# which override these via Compose's shell-over-env-file precedence. Variables
|
|
# not overridden fall back to the values here.
|
|
#
|
|
# Backend runtime defaults that compose does not care about live in
|
|
# backend/scripts/_env.
|
|
|
|
# Container names and volume names. Volumes are pinned by explicit name
|
|
# (rather than relying on COMPOSE_PROJECT_NAME prefixing) so the physical
|
|
# volumes survive project renames without a data migration. ws0 reuses the
|
|
# pre-Stage-2 physical volume names (penpotdev_*).
|
|
PENPOT_MAIN_CONTAINER_NAME=penpot-devenv-ws0-main
|
|
PENPOT_VALKEY_CONTAINER_NAME=penpot-devenv-ws0-valkey
|
|
PENPOT_VALKEY_HOSTNAME=penpot-devenv-ws0-valkey
|
|
PENPOT_POSTGRES_DATA_VOLUME=penpotdev_postgres_data_pg16
|
|
PENPOT_MINIO_DATA_VOLUME=penpotdev_minio_data
|
|
PENPOT_USER_DATA_VOLUME=penpotdev_user_data
|
|
PENPOT_VALKEY_DATA_VOLUME=penpotdev_valkey_data
|
|
|
|
# Backend runtime config (passed to the container env block). PENPOT_REDIS_URI
|
|
# is set explicitly per instance to match the per-instance Valkey container
|
|
# name; ws1+ overlays override this.
|
|
PENPOT_HOST=devenv
|
|
PENPOT_PUBLIC_URI=https://localhost:3449
|
|
PENPOT_DATABASE_URI=postgresql://postgres/penpot
|
|
PENPOT_DATABASE_USERNAME=penpot
|
|
PENPOT_DATABASE_PASSWORD=penpot
|
|
PENPOT_DATABASE_MAX_POOL_SIZE=20
|
|
PENPOT_REDIS_URI=redis://penpot-devenv-ws0-valkey/0
|
|
|
|
# Object storage (MinIO user/policy are provisioned by the infra compose file).
|
|
PENPOT_OBJECTS_STORAGE_BACKEND=s3
|
|
PENPOT_OBJECTS_STORAGE_S3_ENDPOINT=http://minio:9000
|
|
PENPOT_OBJECTS_STORAGE_S3_BUCKET=penpot
|
|
AWS_ACCESS_KEY_ID=penpot-devenv
|
|
AWS_SECRET_ACCESS_KEY=penpot-devenv
|
|
|
|
# Published host ports. Only ports that need to be reachable from outside the
|
|
# container are exposed; everything else (frontend dev server, backend API,
|
|
# storybook, exporter, REPLs, plugins, MCP inspector/websocket, aux) is
|
|
# accessed in-process or through the same-origin Caddy/nginx proxy at
|
|
# PENPOT_PUBLIC_HTTP_PORT. Container-internal ports remain fixed; per-instance
|
|
# overlays may offset these host-side values.
|
|
PENPOT_PUBLIC_HTTP_PORT=3449
|
|
PENPOT_MCP_SERVER_PORT=4401
|
|
PENPOT_MCP_REPL_PORT=4403
|
|
|
|
SHADOW_SERVER_URL=wss://localhost:3449
|
|
|
|
# Serena (agentic devenv). These are the published host ports for ws0; ws1+
|
|
# offset them by 10000*N. The container-internal ports (Serena MCP 14281,
|
|
# dashboard 24282) are fixed by Serena and mapped to these in compose.
|
|
SERENA_EXTERNAL_PORT=14181
|
|
SERENA_DASHBOARD_EXTERNAL_PORT=14182
|
|
|
|
# Backend worker (scheduled + async tasks). ws0 only; per-instance overlays
|
|
# for ws1+ override this to false. See mem:devenv/core.
|
|
PENPOT_BACKEND_WORKER=true
|
|
|
|
# Tmux session inside the main container.
|
|
PENPOT_TMUX_ATTACH=true
|
|
|
|
# Base directory holding non-main workspace clones (one subdir per wsN, N>=1).
|
|
# Consumed by manage.sh only. Default lives in manage.sh ($HOME expansion is
|
|
# not applied to values in this file). Export PENPOT_WORKSPACES_DIR to
|
|
# override.
|