Merge pull request #14822 from runcom/host-config-links-on-start
Allow starting a container with an existing hostConfig which contains links
This commit is contained in:
commit
4b0f56e20b
1 changed files with 8 additions and 0 deletions
|
@ -3,6 +3,7 @@ package parsers
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"net/url"
|
"net/url"
|
||||||
|
"path"
|
||||||
"runtime"
|
"runtime"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
|
@ -158,5 +159,12 @@ func ParseLink(val string) (string, string, error) {
|
||||||
if len(arr) == 1 {
|
if len(arr) == 1 {
|
||||||
return val, val, nil
|
return val, val, nil
|
||||||
}
|
}
|
||||||
|
// This is kept because we can actually get an HostConfig with links
|
||||||
|
// from an already created container and the format is not `foo:bar`
|
||||||
|
// but `/foo:/c1/bar`
|
||||||
|
if strings.HasPrefix(arr[0], "/") {
|
||||||
|
_, alias := path.Split(arr[1])
|
||||||
|
return arr[0][1:], alias, nil
|
||||||
|
}
|
||||||
return arr[0], arr[1], nil
|
return arr[0], arr[1], nil
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue