From 4b2bdc66f06e84d1e3ca16a1c0cc2a855f243cdb Mon Sep 17 00:00:00 2001
From: David Snopek <dsnopek@gmail.com>
Date: Wed, 9 Nov 2016 09:25:03 -0600
Subject: [PATCH] Setup all networks, even those that don't have running
 containers.

---
 docker.sh | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/docker.sh b/docker.sh
index 2b418a8..0880ddf 100644
--- a/docker.sh
+++ b/docker.sh
@@ -23,6 +23,14 @@ add_to_forward() {
 	fi
 }
 
+add_to_nat() {
+	local docker_int=$1
+	local subnet=$2
+
+	iptables -t nat -A POSTROUTING -s ${subnet} ! -o ${docker_int} -j MASQUERADE
+	iptables -t nat -A DOCKER -i ${docker_int} -j RETURN
+}
+
 add_to_docker_isolation() {
 	local int_in=$1
 	local int_out=$2
@@ -52,15 +60,15 @@ iptables -t nat -A POSTROUTING -s ${DOCKER_NETWORK} ! -o ${DOCKER_INT} -j MASQUE
 bridges=`docker network ls -q --filter='Driver=bridge'`
 
 for bridge in $bridges; do
-	DOCKER_NET_INT="br-$(echo $bridge | cut -c -12)"
+	DOCKER_NET_INT="br-$bridge"
 	subnet=`docker network inspect -f '{{(index .IPAM.Config 0).Subnet}}' $bridge`
 
-	iptables -t nat -A POSTROUTING -s ${subnet} ! -o ${DOCKER_NET_INT} -j MASQUERADE
-	iptables -t nat -A DOCKER -i ${DOCKER_NET_INT} -j RETURN
+	add_to_nat ${DOCKER_NET_INT} ${subnet}
+	add_to_forward ${DOCKER_NET_INT}
 
 	for other_bridge in $bridges; do
 		if [ $other_bridge != $bridge ]; then
-			add_to_docker_isolation br-$bridge br-$other_bridge
+			add_to_docker_isolation ${DOCKER_NET_INT} br-$other_bridge
                 fi
         done
 done
@@ -77,16 +85,6 @@ if [ `echo ${containers} | wc -c` -gt "1" ]; then
 		else
 			DOCKER_NET_INT=br-$(docker inspect -f "{{.NetworkSettings.Networks.${netmode}.NetworkID}}" ${container} | cut -c -12)
 			ipaddr=`docker inspect -f "{{.NetworkSettings.Networks.${netmode}.IPAddress}}" ${container}`
-
-			add_to_docker_isolation ${DOCKER_NET_INT} ${DOCKER_INT}
-			add_to_docker_isolation ${DOCKER_INT} ${DOCKER_NET_INT}
-
-			add_to_forward ${DOCKER_NET_INT}
-
-			iptables -C -t nat -I DOCKER -i ${DOCKER_NET_INT} -j RETURN > /dev/null 2>&1
-			if [ $? -eq 0 ]; then
-				iptables -t nat -I DOCKER -i ${DOCKER_NET_INT} -j RETURN
-			fi
 		fi
 
                 rules=`docker port ${container} | sed 's/ //g'`