frodovdr/csf-post-docker
1
0
Fork 0
mirror of https://github.com/juliengk/csf-post-docker.git synced 2023-10-10 11:37:41 +00:00
Code Issues Releases Wiki Activity

Update docker.sh

Browse Source 
Fixed bridges name check "com.docker.network.bridge.name"
This commit is contained in:
Tw1nh34d
2019-09-19 14:40:59 +02:00
committed by Julien Kassar
parent 61513b408f
commit 64597592d7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docker.sh
View File

@@ -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'` bridges=`docker network ls -q --filter='Driver=bridge'`
for bridge in $bridges; do 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` subnet=`docker network inspect -f '{{(index .IPAM.Config 0).Subnet}}' $bridge`
add_to_nat ${DOCKER_NET_INT} ${subnet} 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}` ipaddr=`docker inspect -f "{{.NetworkSettings.IPAddress}}" ${container}`
else else
bridge=$(docker inspect -f "{{.NetworkSettings.Networks.${netmode}.NetworkID}}" ${container} | cut -c -12) 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}` ipaddr=`docker inspect -f "{{.NetworkSettings.Networks.${netmode}.IPAddress}}" ${container}`
fi fi