mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-02-07 01:19:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1862 from ich777/patch-4

Browse Source 
Fix for rc.docker for interfaces with higher index than 0
This commit is contained in:
tom mortensen
2024-09-16 14:57:48 -07:00
committed by GitHub
parent 66d7193dab e3c4ff280d
commit 20ef176665
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
etc/rc.d/rc.docker
View File

@@ -264,15 +264,19 @@ docker_network_start(){
USER_NETWORKS=$(docker inspect --format='{{range $key,$value:=.NetworkSettings.Networks}}{{$key}};{{if $value.IPAMConfig}}{{if $value.IPAMConfig.IPv4Address}}{{$value.IPAMConfig.IPv4Address}}{{end}}{{if $value.IPAMConfig.IPv6Address}},{{$value.IPAMConfig.IPv6Address}}{{end}}{{end}} {{end}}' $CONTAINER)
for ROW in $USER_NETWORKS; do
ROW=(${ROW/;/ })
MY_NETWORK=${ROW[0]}
MY_IP=${ROW[1]/,/;}
if [[ -n $MY_NETWORK && $MY_NETWORK != $MY_NETWORK ]]; then
LABEL=${MY_NETWORK//[0-9.]/}
if [[ $STOCK =~ $LABEL && $LABEL != ${PORT:0:-1} ]]; then
MY_NETWORK=${MY_NETWORK/$LABEL/${PORT:0:-1}}
USER_NETWORK=${ROW[0]}
USER_IP=${ROW[1]/,/;}
if [[ -n $USER_NETWORK && $USER_NETWORK != $MY_NETWORK ]]; then
LABEL=${USER_NETWORK//[0-9.]/}
IF_NO_PARTS=${USER_NETWORK#"$LABEL"}
IF_NO=${IF_NO_PARTS%%.*}
if [[ $STOCK =~ $LABEL && $IF_NO -gt 0 ]]; then
USER_NETWORK=$USER_NETWORK
elif [[ $STOCK =~ $LABEL && $LABEL != ${PORT:0:-1} ]]; then
USER_NETWORK=${USER_NETWORK/$LABEL/${PORT:0:-1}}
fi
log "container $CONTAINER has an additional network that will be restored: $MY_NETWORK"
NETRESTORE[$MY_NETWORK]="$CONTAINER,$MY_IP ${NETRESTORE[$MY_NETWORK]}"
log "container $CONTAINER has an additional network that will be restored: $USER_NETWORK"
NETRESTORE[$USER_NETWORK]="$CONTAINER,$USER_IP ${NETRESTORE[$USER_NETWORK]}"
fi
done
done