sebarocks/docker-windows
1
0
Fork 0
mirror of https://github.com/dockur/windows.git synced 2025-10-27 19:35:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add option to have multiple bridges

Browse source
This commit is contained in:
Gytis Stoškevičius 2025-04-01 15:29:25 +03:00
parent a5c2af4742
commit 0528800424
1 changed files with 105 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

146
src/network.sh
View file

@ -20,6 +20,7 @@ set -Eeuox pipefail
: "${DNSMASQ:="/usr/sbin/dnsmasq"}" : "${DNSMASQ:="/usr/sbin/dnsmasq"}"
: "${DNSMASQ_CONF_DIR:="/etc/dnsmasq.d"}" : "${DNSMASQ_CONF_DIR:="/etc/dnsmasq.d"}"
ETH_COUNT=$(ls /sys/class/net | grep -E '^eth[0-9]+$' | wc -l)
ADD_ERR="Please add the following setting to your container:" ADD_ERR="Please add the following setting to your container:"
# ###################################### # ######################################
@ -50,8 +51,8 @@ find_free_ip() {
configure_guest_network_interface() { configure_guest_network_interface() {
if [[ "${NETWORK,,}" == "bridge"* ]]; then if [[ "${NETWORK,,}" == "bridge"* ]]; then
for ((i = 0; i < ETH_COUNT; i++)); do
HOST_INTERFACE="dockerbridge" HOST_INTERFACE="dockerbridge$i"
CURRENT_IP=$(ip addr show $HOST_INTERFACE | grep -oP 'inet \K[\d.]+') CURRENT_IP=$(ip addr show $HOST_INTERFACE | grep -oP 'inet \K[\d.]+')
MASK="$(ip -4 addr show $HOST_INTERFACE | awk '/inet / {print $2}' | cut -d'/' -f2)" MASK="$(ip -4 addr show $HOST_INTERFACE | awk '/inet / {print $2}' | cut -d'/' -f2)"
@ -76,8 +77,16 @@ configure_guest_network_interface() {
route add default gw $GW route add default gw $GW
echo -e '{"execute": "guest-exec", "arguments": {"path": "C:\\\\Windows\\\\System32\\\\netsh.exe", "arg": ["interface", "ipv4", "set", "address", "name=\\"Ethernet\\"", "static", "'"$CURRENT_IP"'", "255.255.255.0", "'"$GW"'"]}}' | nc -U /tmp/qga.sock -w 5 if [ $i -eq 0 ]; then
echo -e '{"execute": "guest-exec", "arguments": {"path": "C:\\\\Windows\\\\System32\\\\netsh.exe", "arg": ["interface", "ipv4", "add", "dnsservers", "name=\\"Ethernet\\"", "address=\\"'$GW'\\"", "index=\\"1\\""]}}' | nc -U /tmp/qga.sock -w 5 INTERFACE_NAME="Ethernet"
else
IDX=$((1 + i))
INTERFACE_NAME="Ethernet $IDX"
fi
echo -e '{"execute": "guest-exec", "arguments": {"path": "C:\\\\Windows\\\\System32\\\\netsh.exe", "capture-output": true, "arg": ["interface", "ipv4", "set", "address", "'"$INTERFACE_NAME"'", "static", "'$CURRENT_IP'", "255.255.255.0", "'$GW'"]}}' | nc -U /tmp/qga.sock -w 5
echo -e '{"execute": "guest-exec", "arguments": {"path": "C:\\\\Windows\\\\System32\\\\netsh.exe", "capture-output": true, "arg": ["interface", "ipv4", "add", "dnsservers", "'"$INTERFACE_NAME"'", "1.1.1.1", "index=1"]}}' | nc -U /tmp/qga.sock -w 5
done
fi fi
@ -379,10 +388,12 @@ configureBridge() {
fi fi
fi fi
# Create a bridge with a static IP for the VM guest for ((i = 0; i < ETH_COUNT; i++)); do
DOCKER_BRIDGE="dockerbridge$i"
NET_DEV="eth$i"
NET_TAP="qemu$i"
{ {
ip link add dev dockerbridge type bridge ip link add dev $DOCKER_BRIDGE type bridge
rc=$? rc=$?
} || : } || :
@ -390,109 +401,59 @@ configureBridge() {
error "Failed to create bridge. $ADD_ERR --cap-add NET_ADMIN" && return 1 error "Failed to create bridge. $ADD_ERR --cap-add NET_ADMIN" && return 1
fi fi
# {
# ip link add dev dockerbridge_2 type bridge
# rc=$?
# } || :
# if ((rc != 0)); then
# error "Failed to create bridge. $ADD_ERR --cap-add NET_ADMIN" && return 1
# fi
# We need freshly created bridge to have IP address of the container # We need freshly created bridge to have IP address of the container
# For this reason we need to migrate IP from eth0 to dockerbridge. # For this reason we need to migrate IP from eth0 to dockerbridge.
for addr in $(ip --json addr show dev $VM_NET_DEV | jq -c '.[0].addr_info[] | select(.family == "inet")'); do for addr in $(ip --json addr show dev $NET_DEV | jq -c '.[0].addr_info[] | select(.family == "inet")'); do
cidr_addr=$(echo $addr | jq -r '[ .local, .prefixlen|tostring] | join("/")') cidr_addr=$(echo $addr | jq -r '[ .local, .prefixlen|tostring] | join("/")')
if ! ip addr add dev dockerbridge $cidr_addr; then if ! ip addr add dev $DOCKER_BRIDGE $cidr_addr; then
error "Failed to add address for dockerbridge interface" error "Failed to add address for $DOCKER_BRIDGE interface"
exit 30 exit 30
fi fi
done done
if ! ip addr flush dev $VM_NET_DEV; then
error "Failed to clear $VM_NET_DEV interface addresses" if ! ip addr flush dev $NET_DEV; then
error "Failed to clear $NET_DEV interface addresses"
exit 30 exit 30
fi fi
while ! ip link set dockerbridge up; do while ! ip link set $DOCKER_BRIDGE up; do
info "Waiting for IP address to become available..." info "Waiting for IP address to become available..."
sleep 2 sleep 2
done done
# # We need freshly created bridge to have IP address of the container
# # For this reason we need to migrate IP from eth0 to dockerbridge.
# for addr in $(ip --json addr show dev $VM_NET_DEV_2 | jq -c '.[0].addr_info[] | select(.family == "inet")'); do
# cidr_addr=$(echo $addr | jq -r '[ .local, .prefixlen|tostring] | join("/")')
# if ! ip addr add dev dockerbridge_2 $cidr_addr; then
# error "Failed to add address for dockerbridge_2 interface"
# exit 30
# fi
# done
# if ! ip addr flush dev $VM_NET_DEV_2; then
# error "Failed to clear $VM_NET_DEV_2 interface addresses"
# exit 30
# fi
# while ! ip link set dockerbridge_2 up; do
# info "Waiting for IP address to become available..."
# sleep 2
# done
# QEMU Works with taps, set tap to the bridge created # QEMU Works with taps, set tap to the bridge created
if ! ip tuntap add dev "$VM_NET_TAP" mode tap; then if ! ip tuntap add dev "$NET_TAP" mode tap; then
error "$tuntap" && return 1 error "$tuntap" && return 1
fi fi
while ! ip link set "$VM_NET_TAP" up promisc on; do while ! ip link set "$NET_TAP" up promisc on; do
info "Waiting for TAP to become available..." info "Waiting for TAP to become available..."
sleep 2 sleep 2
done done
if ! ip link set dev "$VM_NET_TAP" master dockerbridge; then if ! ip link set dev "$NET_TAP" master $DOCKER_BRIDGE; then
error "Failed to set IP link!" && return 1 error "Failed to set IP link!" && return 1
fi fi
if ! ip link set dev "$VM_NET_DEV" master dockerbridge; then if ! ip link set dev "$NET_DEV" master $DOCKER_BRIDGE; then
error "Failed to attach docker interface to bridge" error "Failed to attach docker interface to bridge"
fi fi
# if ! ip tuntap add dev "$VM_NET_TAP_2" mode tap; then NET_OPTS+=" -netdev tap,id=hostnet$i,ifname=$NET_TAP"
# error "$tuntap" && return 1
# fi
# while ! ip link set "$VM_NET_TAP_2" up promisc on; do
# info "Waiting for TAP to become available..."
# sleep 2
# done
# if ! ip link set dev "$VM_NET_TAP_2" master dockerbridge_2; then
# error "Failed to set IP link!" && return 1
# fi
NET_OPTS="-netdev tap,id=hostnet0,ifname=$VM_NET_TAP"
if [ -c /dev/vhost-net ]; then if [ -c /dev/vhost-net ]; then
{ fd=$((40 + i))
exec 40>>/dev/vhost-net eval "exec $fd>>/dev/vhost-net"
rc=$? rc=$?
} 2>/dev/null || : if ((rc == 0)); then
((rc == 0)) && NET_OPTS+=",vhost=on,vhostfd=40" NET_OPTS+=",vhost=on,vhostfd=$fd"
fi
fi fi
NET_OPTS+=",script=no,downscript=no" NET_OPTS+=",script=no,downscript=no "
# NET_OPTS+=" -netdev tap,id=hostnet1,ifname=$VM_NET_TAP_2" done
# if [ -c /dev/vhost-net ]; then
# {
# exec 41>>/dev/vhost-net
# rc=$?
# } 2>/dev/null || :
# ((rc == 0)) && NET_OPTS+=",vhost=on,vhostfd=41"
# fi
# NET_OPTS+=",script=no,downscript=no"
return 0 return 0
} }
closeNetwork() { closeNetwork() {
@ -518,11 +479,21 @@ closeNetwork() {
[[ "${NETWORK,,}" == "user"* ]] && return 0 [[ "${NETWORK,,}" == "user"* ]] && return 0
if [[ "${NETWORK,,}" == "bridge"* ]]; then
for ((i = 0; i < ETH_COUNT; i++)); do
ip link set "qemu$i" down promisc off || true
ip link delete "qemu$i" || true
ip link set dockerbridge$i down || true
ip link delete dockerbridge$i || true
done
else
ip link set "$VM_NET_TAP" down promisc off || true ip link set "$VM_NET_TAP" down promisc off || true
ip link delete "$VM_NET_TAP" || true ip link delete "$VM_NET_TAP" || true
ip link set dockerbridge down || true ip link set dockerbridge down || true
ip link delete dockerbridge || true ip link delete dockerbridge || true
fi
fi fi
@ -666,16 +637,13 @@ else
if ! configureBridge; then if ! configureBridge; then
error "Failed to setup bridge networking" error "Failed to setup bridge networking"
for ((i = 0; i < ETH_COUNT; i++)); do
ip link set "$VM_NET_TAP$i" down promisc off &>null || true
ip link delete "$VM_NET_TAP$i" &>null || true
ip link set "$VM_NET_TAP" down promisc off &>null || true ip link set dockerbridge$i down &>null || true
ip link delete "$VM_NET_TAP" &>null || true ip link delete dockerbridge$i &>null || true
# ip link set "$VM_NET_TAP_2" down promisc off &>null || true done
# ip link delete "$VM_NET_TAP_2" &>null || true
ip link set dockerbridge down &>null || true
ip link delete dockerbridge &>null || true
# ip link set dockerbridge_2 down &>null || true
# ip link delete dockerbridge_2 &>null || true
exit 25 exit 25
fi fi
@ -685,7 +653,13 @@ else
fi fi
NET_OPTS+=" -device $ADAPTER,romfile=,netdev=hostnet0,mac=$VM_NET_MAC,id=net0" NET_OPTS+=" -device $ADAPTER,romfile=,netdev=hostnet0,mac=$VM_NET_MAC,id=net0"
# NET_OPTS+=" -device $ADAPTER_2,romfile=,netdev=hostnet1,mac=$VM_NET_MAC_2,id=net1"
if [[ "${NETWORK,,}" == "bridge"* ]]; then
for ((i = 1; i < ETH_COUNT; i++)); do
MAC=$(printf "52:54:00:%02X:%02X:%02X" $((RANDOM % 256)) $((RANDOM % 256)) $((RANDOM % 256)))
NET_OPTS+=" -device $ADAPTER,romfile=,netdev=hostnet$i,mac=$MAC,id=net$i"
done
fi
NET_OPTS+=" -device virtio-serial-pci,id=virtserial0,bus=pcie.0,addr=0x6" NET_OPTS+=" -device virtio-serial-pci,id=virtserial0,bus=pcie.0,addr=0x6"
NET_OPTS+=" -chardev socket,id=qga0,path=/tmp/qga.sock,server=on,wait=off" NET_OPTS+=" -chardev socket,id=qga0,path=/tmp/qga.sock,server=on,wait=off"