Update docker-network.sh

This commit is contained in:
2025-07-12 18:38:21 +00:00
parent 822b03cc7a
commit 4493d7e6db

View File

@@ -20,6 +20,8 @@ if [[ -f "$DOCKER_CONFIG" ]] && grep -q '"default-address-pools"' "$DOCKER_CONFI
fi fi
# Step 2: Ask for second octet (suggest default if available) # Step 2: Ask for second octet (suggest default if available)
USE_EXISTING_CONFIG=false
if [[ -n "$DEFAULT_OCTET" ]]; then if [[ -n "$DEFAULT_OCTET" ]]; then
read -rp "Use existing second octet ($DEFAULT_OCTET)? [Y/n]: " confirm read -rp "Use existing second octet ($DEFAULT_OCTET)? [Y/n]: " confirm
confirm=${confirm:-Y} confirm=${confirm:-Y}
@@ -27,6 +29,7 @@ if [[ -n "$DEFAULT_OCTET" ]]; then
read -rp "Enter new second octet (e.g. 102): " OCTET read -rp "Enter new second octet (e.g. 102): " OCTET
else else
OCTET="$DEFAULT_OCTET" OCTET="$DEFAULT_OCTET"
USE_EXISTING_CONFIG=true
fi fi
else else
read -rp "Enter second octet for Docker address pool (e.g. 102): " OCTET read -rp "Enter second octet for Docker address pool (e.g. 102): " OCTET
@@ -38,7 +41,8 @@ if ! [[ "$OCTET" =~ ^[0-9]+$ ]] || ((OCTET < 1 || OCTET > 254)); then
exit 1 exit 1
fi fi
# Step 3: Write daemon.json (overwrite or create) # Step 3: Write daemon.json (overwrite or create) only if needed
if [[ "$USE_EXISTING_CONFIG" == false ]]; then
echo "Writing Docker daemon config with base: 10.${OCTET}.0.0/16" echo "Writing Docker daemon config with base: 10.${OCTET}.0.0/16"
sudo mkdir -p /etc/docker sudo mkdir -p /etc/docker
cat <<EOF | sudo tee "$DOCKER_CONFIG" > /dev/null cat <<EOF | sudo tee "$DOCKER_CONFIG" > /dev/null
@@ -52,11 +56,13 @@ cat <<EOF | sudo tee "$DOCKER_CONFIG" > /dev/null
} }
EOF EOF
# Step 4: Restart Docker
echo "Restarting Docker..." echo "Restarting Docker..."
sudo systemctl restart docker sudo systemctl restart docker
else
echo "🟡 Skipping daemon config update and Docker restart (using existing settings)"
fi
# Step 5: Create standard networks # Step 4: Create standard networks
declare -A networks declare -A networks
networks[internet]="10.${OCTET}.100.0/24" networks[internet]="10.${OCTET}.100.0/24"
networks[pangolin_transport]="10.${OCTET}.200.0/24" networks[pangolin_transport]="10.${OCTET}.200.0/24"
@@ -83,4 +89,4 @@ for name in "${!networks[@]}"; do
fi fi
done done
echo "Done. Docker daemon configured and standard networks created." echo "Done. Docker daemon configured and standard networks created."