From 68a4effad5cf0405e93ff08ae3d06fafec51f204 Mon Sep 17 00:00:00 2001 From: Claude Date: Sat, 20 Jun 2026 04:06:51 +0000 Subject: [PATCH] fix(services): conditional caddy_net for filebrowser, homebox, watchtower Only include the caddy_net network block in docker-compose.yml when ~/docker/caddy exists, preventing "network not found" errors on standalone installs without Caddy. Co-Authored-By: Claude Sonnet 4.6 Claude-Session: https://claude.ai/code/session_01D8ckUJQtj1pH8jtAddBDZs --- services/filebrowser.sh | 25 ++++++++++++++++++------- services/homebox.sh | 25 ++++++++++++++++++------- services/watchtower.sh | 25 ++++++++++++++++++------- 3 files changed, 54 insertions(+), 21 deletions(-) diff --git a/services/filebrowser.sh b/services/filebrowser.sh index 1ad1e28..3a361d9 100644 --- a/services/filebrowser.sh +++ b/services/filebrowser.sh @@ -199,6 +199,23 @@ install_filebrowser() { local FB_PATH="" prompt_text "Primary files directory to browse [default: $ACTUAL_HOME]:" "$ACTUAL_HOME" FB_PATH + 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 > docker-compose.yml << FB_COMPOSE name: filebrowser @@ -215,13 +232,7 @@ services: - ${FB_PATH}:/files ports: - "8085:80" - networks: - - caddy_net - -networks: - caddy_net: - external: true - name: \${CADDY_NET:-caddy_net} +${_CADDY_NET_BLOCK}${_CADDY_NET_SECTION} FB_COMPOSE cat > .env << FB_ENV diff --git a/services/homebox.sh b/services/homebox.sh index 9eeed7d..4415e28 100644 --- a/services/homebox.sh +++ b/services/homebox.sh @@ -197,6 +197,23 @@ install_homebox() { ensure_docker_dir_ownership "$HB_DIR" cd "$HB_DIR" || return 1 + 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 > docker-compose.yml << HB_COMPOSE name: homebox @@ -213,13 +230,7 @@ services: - ./data:/data ports: - "7745:7745" - networks: - - caddy_net - -networks: - caddy_net: - external: true - name: \${CADDY_NET:-caddy_net} +${_CADDY_NET_BLOCK}${_CADDY_NET_SECTION} HB_COMPOSE cat > .env << HB_ENV diff --git a/services/watchtower.sh b/services/watchtower.sh index 1d05908..4eb51a1 100644 --- a/services/watchtower.sh +++ b/services/watchtower.sh @@ -128,6 +128,23 @@ install_watchtower() { NTFY_URL="http://ntfy/watchtower" fi + 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 > docker-compose.yml << WT_COMPOSE name: watchtower @@ -152,13 +169,7 @@ services: - WATCHTOWER_DEBUG=false volumes: - /var/run/docker.sock:/var/run/docker.sock:ro - networks: - - caddy_net - -networks: - caddy_net: - external: true - name: \${CADDY_NET:-caddy_net} +${_CADDY_NET_BLOCK}${_CADDY_NET_SECTION} WT_COMPOSE # Create .env