From 07d09a73fe181d14b4a1538de5ad08fc5d848f4a Mon Sep 17 00:00:00 2001 From: Claude Date: Sat, 20 Jun 2026 03:49:53 +0000 Subject: [PATCH] fix(js99er): missing write_readme stub + conditional caddy_net - Add write_readme() to the standalone bootstrap stubs (was defined in wolf-pair.sh and other services but missing here) - Only include the caddy_net network block in docker-compose.yml when ~/docker/caddy exists; otherwise docker compose up fails with "network caddy_net declared as external, but could not be found" Co-Authored-By: Claude Sonnet 4.6 Claude-Session: https://claude.ai/code/session_01D8ckUJQtj1pH8jtAddBDZs --- services/js99er.sh | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/services/js99er.sh b/services/js99er.sh index 3f380f1..42e2d43 100644 --- a/services/js99er.sh +++ b/services/js99er.sh @@ -168,6 +168,12 @@ CBLOCK log_info " rsync -av $_snippet_dir/ caddy-host:~/caddy-snippets/ (all at once)" fi } + + write_readme() { + local _dir="$1"; shift + mkdir -p "$_dir" + cat > "$_dir/README.md" + } fi # Globals — ACTUAL_USER/ACTUAL_HOME must come before DOCKER_DIR @@ -428,6 +434,25 @@ NGINXCONF log_success "nginx config created" # ── 4. Standalone docker-compose.yml (per-service folder) ──────────────── + # Only join caddy_net if Caddy is installed — otherwise the network doesn't + # exist and docker compose up will fail with "network not found". + local _CADDY_NET_BLOCK="" + if [ -d "$DOCKER_DIR/caddy" ]; then + _CADDY_NET_BLOCK=" networks: + - caddy_net +" + fi + + local _CADDY_NET_SECTION="" + if [ -d "$DOCKER_DIR/caddy" ]; then + _CADDY_NET_SECTION=" +networks: + caddy_net: + external: true + name: ${SITE_CADDY_NET:-caddy_net} +" + fi + cat > "$JS99ER_DIR/docker-compose.yml" << COMPOSE name: js99er @@ -440,13 +465,7 @@ services: ports: - "${JS99ER_PORT}:80" restart: unless-stopped - networks: - - caddy_net - -networks: - caddy_net: - external: true - name: \${CADDY_NET:-caddy_net} +${_CADDY_NET_BLOCK}${_CADDY_NET_SECTION} COMPOSE log_success "Created js99er/docker-compose.yml"