0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #47185 from vvoland/volume-cifs-resolve-optout

Browse source 
volume/local: Make host resolution backwards compatible
This commit is contained in:
Sebastiaan van Stijn 2024-01-23 16:23:40 +01:00 • committed by GitHub
commit ca67dbd12c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
volume/local/local_unix.go
View file

@ -127,16 +127,20 @@ func (v *localVolume) mount() error {
mountDevice := v.opts.MountDevice
switch v.opts.MountType {
case "nfs":
case "nfs", "cifs":
if addrValue := getAddress(v.opts.MountOpts); addrValue != "" && net.ParseIP(addrValue).To4() == nil {
ipAddr, err := net.ResolveIPAddr("ip", addrValue)
if err != nil {
return errors.Wrapf(err, "error resolving passed in network volume address")
return errors.Wrap(err, "error resolving passed in network volume address")
}
mountOpts = strings.Replace(mountOpts, "addr="+addrValue, "addr="+ipAddr.String(), 1)
}
case "cifs":
deviceURL, err := url.Parse(v.opts.MountDevice)
if v.opts.MountType != "cifs" {
break
}
deviceURL, err := url.Parse(mountDevice)
if err != nil {
return errors.Wrapf(err, "error parsing mount device url")
}