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 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01D8ckUJQtj1pH8jtAddBDZs
This commit is contained in:
+26
-7
@@ -168,6 +168,12 @@ CBLOCK
|
|||||||
log_info " rsync -av $_snippet_dir/ caddy-host:~/caddy-snippets/ (all at once)"
|
log_info " rsync -av $_snippet_dir/ caddy-host:~/caddy-snippets/ (all at once)"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
write_readme() {
|
||||||
|
local _dir="$1"; shift
|
||||||
|
mkdir -p "$_dir"
|
||||||
|
cat > "$_dir/README.md"
|
||||||
|
}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Globals — ACTUAL_USER/ACTUAL_HOME must come before DOCKER_DIR
|
# Globals — ACTUAL_USER/ACTUAL_HOME must come before DOCKER_DIR
|
||||||
@@ -428,6 +434,25 @@ NGINXCONF
|
|||||||
log_success "nginx config created"
|
log_success "nginx config created"
|
||||||
|
|
||||||
# ── 4. Standalone docker-compose.yml (per-service folder) ────────────────
|
# ── 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
|
cat > "$JS99ER_DIR/docker-compose.yml" << COMPOSE
|
||||||
name: js99er
|
name: js99er
|
||||||
|
|
||||||
@@ -440,13 +465,7 @@ services:
|
|||||||
ports:
|
ports:
|
||||||
- "${JS99ER_PORT}:80"
|
- "${JS99ER_PORT}:80"
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
networks:
|
${_CADDY_NET_BLOCK}${_CADDY_NET_SECTION}
|
||||||
- caddy_net
|
|
||||||
|
|
||||||
networks:
|
|
||||||
caddy_net:
|
|
||||||
external: true
|
|
||||||
name: \${CADDY_NET:-caddy_net}
|
|
||||||
COMPOSE
|
COMPOSE
|
||||||
log_success "Created js99er/docker-compose.yml"
|
log_success "Created js99er/docker-compose.yml"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user