From 64597592d781d97a513602d03d1fcf74b750d372 Mon Sep 17 00:00:00 2001 From: Tw1nh34d <55540912+Tw1nh34d@users.noreply.github.com> Date: Thu, 19 Sep 2019 14:40:59 +0200 Subject: [PATCH] Update docker.sh Fixed bridges name check "com.docker.network.bridge.name" --- docker.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker.sh b/docker.sh index 160200c..2ddab93 100644 --- a/docker.sh +++ b/docker.sh @@ -63,7 +63,7 @@ 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=`docker network inspect -f '{{"br-$bridge" | or (index .Options "com.docker.network.bridge.name")}}' $bridge` + DOCKER_NET_INT=`docker network inspect -f '{{"'br-$bridge'" | or (index .Options "com.docker.network.bridge.name")}}' $bridge` subnet=`docker network inspect -f '{{(index .IPAM.Config 0).Subnet}}' $bridge` add_to_nat ${DOCKER_NET_INT} ${subnet} @@ -81,7 +81,7 @@ if [ `echo ${containers} | wc -c` -gt "1" ]; then ipaddr=`docker inspect -f "{{.NetworkSettings.IPAddress}}" ${container}` else bridge=$(docker inspect -f "{{.NetworkSettings.Networks.${netmode}.NetworkID}}" ${container} | cut -c -12) - DOCKER_NET_INT=`docker network inspect -f '{{"br-$bridge" | or (index .Options "com.docker.network.bridge.name")}}' $bridge` + DOCKER_NET_INT=`docker network inspect -f '{{"'br-$bridge'" | or (index .Options "com.docker.network.bridge.name")}}' $bridge` ipaddr=`docker inspect -f "{{.NetworkSettings.Networks.${netmode}.IPAddress}}" ${container}` fi