Skip to content

Commit 6066be0

Browse files
committed
fixes for new container manager
1 parent 32c893d commit 6066be0

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

garden/tasks/configuredocker.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ while [ $currentAttempt -lt $totalAttempts ]; do
3636
for port in ${ports[$protocol]}; do
3737
echo "setting $protocol port '$port' for docker"
3838
iptables -t nat -A PREROUTING -p $protocol --dport $port -m addrtype --dst-type LOCAL -j DOCKER
39+
iptables -t nat -A OUTPUT -p $protocol --dport $port -m addrtype --dst-type LOCAL -j DOCKER
3940
done
4041
done
4142

garden/tasks/filesystem.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,9 @@ groupid=$(synogroup --get $groupnamedocker | awk -F "[][{}]" '/Group ID/ { print
141141
videodrivergroupid=$(id -g videodriver)
142142

143143
hostip=$(ip route get 1 | awk '{print $NF;exit}')
144-
hostrange=$(ip -o -f inet addr show eth0 | awk '{print $4}' | sed 's/\.[0-9]\+\//.0\//')
144+
145+
default_interface=$(ip route | awk '/default/ {print $5}' | head -n1)
146+
hostrange=$(ip -o -f inet addr show "$default_interface" | awk '{print $4}' | sed 's/\.[0-9]\+\//.0\//')
145147

146148
timezone=$(readlink /etc/localtime | sed 's|.*/zoneinfo/||')
147149

0 commit comments

Comments
 (0)