From 4493d7e6db84646901ba97e313949db0b6374a6b Mon Sep 17 00:00:00 2001 From: Ryan Hamilton Date: Sat, 12 Jul 2025 18:38:21 +0000 Subject: [PATCH] Update docker-network.sh --- docker-network.sh | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/docker-network.sh b/docker-network.sh index 8806d82..08faf1e 100644 --- a/docker-network.sh +++ b/docker-network.sh @@ -20,6 +20,8 @@ if [[ -f "$DOCKER_CONFIG" ]] && grep -q '"default-address-pools"' "$DOCKER_CONFI fi # Step 2: Ask for second octet (suggest default if available) +USE_EXISTING_CONFIG=false + if [[ -n "$DEFAULT_OCTET" ]]; then read -rp "Use existing second octet ($DEFAULT_OCTET)? [Y/n]: " confirm confirm=${confirm:-Y} @@ -27,6 +29,7 @@ if [[ -n "$DEFAULT_OCTET" ]]; then read -rp "Enter new second octet (e.g. 102): " OCTET else OCTET="$DEFAULT_OCTET" + USE_EXISTING_CONFIG=true fi else read -rp "Enter second octet for Docker address pool (e.g. 102): " OCTET @@ -38,10 +41,11 @@ if ! [[ "$OCTET" =~ ^[0-9]+$ ]] || ((OCTET < 1 || OCTET > 254)); then exit 1 fi -# Step 3: Write daemon.json (overwrite or create) -echo "Writing Docker daemon config with base: 10.${OCTET}.0.0/16" -sudo mkdir -p /etc/docker -cat < /dev/null +# 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" + sudo mkdir -p /etc/docker + cat < /dev/null { "default-address-pools": [ { @@ -52,11 +56,13 @@ cat < /dev/null } EOF -# Step 4: Restart Docker -echo "Restarting Docker..." -sudo systemctl restart docker + echo "Restarting 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 networks[internet]="10.${OCTET}.100.0/24" networks[pangolin_transport]="10.${OCTET}.200.0/24" @@ -83,4 +89,4 @@ for name in "${!networks[@]}"; do fi done -echo "Done. Docker daemon configured and standard networks created." +echo "✅ Done. Docker daemon configured and standard networks created."