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

cifs volume resolves hostname correctly.

Browse source 
Co-authored-by: Paweł Gronowski <me@woland.xyz>
Signed-off-by: Michael Kebe <michael.kebe@gmail.com>
This commit is contained in:
Michael Kebe 2023-11-29 09:18:39 +01:00 • committed by Michael Kebe
parent 718fafed26
commit 8ae94cafa5
1 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
volume/local/local_unix.go
View file

@ -8,6 +8,7 @@ package local // import "github.com/docker/docker/volume/local"
import (
"fmt"
"net"
"net/url"
"os"
"strings"
"syscall"
@ -112,9 +113,12 @@ func (v *localVolume) mount() error {
if v.opts.MountDevice == "" {
return fmt.Errorf("missing device in volume options")
}
mountOpts := v.opts.MountOpts
mountDevice := v.opts.MountDevice
switch v.opts.MountType {
case "nfs", "cifs":
case "nfs":
if addrValue := getAddress(v.opts.MountOpts); addrValue != "" && net.ParseIP(addrValue).To4() == nil {
ipAddr, err := net.ResolveIPAddr("ip", addrValue)
if err != nil {
@ -122,8 +126,25 @@ func (v *localVolume) mount() error {
}
mountOpts = strings.Replace(mountOpts, "addr="+addrValue, "addr="+ipAddr.String(), 1)
}
case "cifs":
deviceURL, err := url.Parse(v.opts.MountDevice)
if err != nil {
return errors.Wrapf(err, "error parsing mount device url")
}
if deviceURL.Host != "" && net.ParseIP(deviceURL.Hostname()) == nil {
ipAddr, err := net.ResolveIPAddr("ip", deviceURL.Hostname())
if err != nil {
return errors.Wrapf(err, "error resolving passed in network volume address")
}
if deviceURL.Port() != "" {
deviceURL.Host = net.JoinHostPort(ipAddr.String(), deviceURL.Port())
} else {
deviceURL.Host = ipAddr.String()
}
mountDevice = deviceURL.String()
}
}
if err := mount.Mount(v.opts.MountDevice, v.path, v.opts.MountType, mountOpts); err != nil {
if err := mount.Mount(mountDevice, v.path, v.opts.MountType, mountOpts); err != nil {
if password := getPassword(v.opts.MountOpts); password != "" {
err = errors.New(strings.Replace(err.Error(), "password="+password, "password=********", 1))
}