mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-05-01 23:39:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix for rc.docker for interfaces with higher index than 0

Browse Source 
- Fix error in first if condition which always returned `false`
- Change name from variables so that it a bit easier to read
- Make sure that custom interfaces with a higher index then 0 are properly rebuilt
This commit is contained in:
Christoph Hummer
2024-09-12 23:12:03 +02:00
committed by GitHub
parent 175d24afd2
commit 19de7c1979
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
etc/rc.d/rc.docker
+11 -7
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]/,/;}
USER_NETWORK=${ROW[0]}
USER_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}}
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