Webstar/LibrePortal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge claude/1

Browse Source
This commit is contained in:
librelad 2026-06-02 15:02:36 +01:00
commit 287c13a311
1 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
scripts/docker/network/network_setup.sh
View File

@ -2,10 +2,29 @@
installDockerNetwork()
{
# Check if network setup is needed
if [[ "$DOCKER_NETWORK_SETUP_NEEDED" == "true" ]]; then
if [[ "$DOCKER_NETWORK_SETUP_NEEDED" != "true" ]]; then
isNotice "Docker network $CFG_NETWORK_NAME already exists or setup not needed"
return 0
fi
isHeader "Create a Docker Network"
# Re-check existence right before creating, and converge instead of erroring
# if it's already there. The requirement check that set
# DOCKER_NETWORK_SETUP_NEEDED can run before the rootless daemon socket is
# reachable (a failed inspect is indistinguishable from "network absent"), and
# a previous install leaves the network behind — both make us think it's new
# when it isn't. If it exists, leave it in place and adopt its real subnet so
# CFG stays in step with docker (and we don't randomize to a subnet we can't apply).
if dockerCommandRun "docker network inspect $CFG_NETWORK_NAME > /dev/null 2>&1"; then
local current_subnet; current_subnet=$(dockerCommandRun "docker network inspect $CFG_NETWORK_NAME --format '{{range .IPAM.Config}}{{.Subnet}}{{end}}' 2>/dev/null")
isNotice "Docker network $CFG_NETWORK_NAME already exists, leaving it in place"
if [[ -n "$current_subnet" && "$current_subnet" != "$CFG_NETWORK_SUBNET" ]]; then
adoptDockerSubnet "$current_subnet"
fi
return 0
fi
isNotice "Network $CFG_NETWORK_NAME not found, creating now"
# Check if we need to generate a new subnet
@ -28,7 +47,4 @@ $CFG_NETWORK_NAME"
isError "Failed to create Docker network $CFG_NETWORK_NAME"
isError " $result"
fi
else
isNotice "Docker network $CFG_NETWORK_NAME already exists or setup not needed"
fi
}