toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge component 'engine' from git@github.com:docker/engine 18.09

Browse Source
This commit is contained in:
GordonTheTurtle
2019-03-09 00:52:55 +00:00
parent 5e4939ab2b 9c47f77927
commit 6064691b74
8 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/engine/hack/dockerfile/install/proxy.installer
View File

@ -3,7 +3,7 @@
# LIBNETWORK_COMMIT is used to build the docker-userland-proxy binary. When
# updating the binary version, consider updating github.com/docker/libnetwork
# in vendor.conf accordingly
LIBNETWORK_COMMIT=2cfbf9b1f98162a55829a21cc603c76072a75382 # bump_18.09 branch
LIBNETWORK_COMMIT=4725f2163fb214a6312f3beae5991f838ec36326 # bump_18.09 branch
install_proxy() {
case "$1" in

2
components/engine/integration/build/build_session_test.go
View File

@ -27,7 +27,7 @@ func TestBuildWithSession(t *testing.T) {
d.StartWithBusybox(t)
defer d.Stop(t)
client := testEnv.APIClient()
client := d.NewClientT(t)
dockerfile := `
FROM busybox

2
components/engine/integration/build/build_squash_test.go
View File

@ -26,7 +26,7 @@ func TestBuildSquashParent(t *testing.T) {
d.StartWithBusybox(t)
defer d.Stop(t)
client := testEnv.APIClient()
client := d.NewClientT(t)
dockerfile := `
FROM busybox

2
components/engine/vendor.conf
View File

@ -37,7 +37,7 @@ github.com/mitchellh/hashstructure 2bca23e0e452137f789efbc8610126fd8b94f73b
#get libnetwork packages
# When updating, also update LIBNETWORK_COMMIT in hack/dockerfile/install/proxy accordingly
github.com/docker/libnetwork 2cfbf9b1f98162a55829a21cc603c76072a75382 # bump_18.09 branch
github.com/docker/libnetwork 4725f2163fb214a6312f3beae5991f838ec36326 # bump_18.09 branch
github.com/docker/go-events 9461782956ad83b30282bf90e31fa6a70c255ba9
github.com/armon/go-radix e39d623f12e8e41c7b5529e9a9dd67a1e2261f80
github.com/armon/go-metrics eb0af217e5e9747e41dd5303755356b62d28e3ec

6
components/engine/vendor/github.com/docker/libnetwork/default_gateway.go generated vendored
View File

@ -181,10 +181,8 @@ func (c *controller) defaultGwNetwork() (Network, error) {
defer func() { <-procGwNetwork }()
n, err := c.NetworkByName(libnGWNetwork)
if err != nil {
if _, ok := err.(types.NotFoundError); ok {
n, err = c.createGWNetwork()
}
if _, ok := err.(types.NotFoundError); ok {
n, err = c.createGWNetwork()
}
return n, err
}

9
components/engine/vendor/github.com/docker/libnetwork/iptables/iptables.go generated vendored
View File

@ -87,16 +87,11 @@ func initFirewalld() {
}
func detectIptables() {
path, err := exec.LookPath("iptables-legacy") // debian has iptables-legacy and iptables-nft now
path, err := exec.LookPath("iptables")
if err != nil {
path, err = exec.LookPath("iptables")
if err != nil {
return
}
return
}
iptablesPath = path
supportsXlock = exec.Command(iptablesPath, "--wait", "-L", "-n").Run() == nil
mj, mn, mc, err := GetVersion()
if err != nil {

8
components/engine/vendor/github.com/docker/libnetwork/network.go generated vendored
View File

@ -396,11 +396,9 @@ func (n *network) validateConfiguration() error {
driverOptions map[string]string
opts interface{}
)
switch data.(type) {
case map[string]interface{}:
opts = data.(map[string]interface{})
case map[string]string:
opts = data.(map[string]string)
switch t := data.(type) {
case map[string]interface{}, map[string]string:
opts = t
}
ba, err := json.Marshal(opts)
if err != nil {

7
components/engine/vendor/github.com/docker/libnetwork/networkdb/cluster.go generated vendored
View File

@ -288,7 +288,12 @@ func (nDB *NetworkDB) rejoinClusterBootStrap() {
return
}
myself, _ := nDB.nodes[nDB.config.NodeID]
myself, ok := nDB.nodes[nDB.config.NodeID]
if !ok {
nDB.RUnlock()
logrus.Warnf("rejoinClusterBootstrap unable to find local node info using ID:%v", nDB.config.NodeID)
return
}
bootStrapIPs := make([]string, 0, len(nDB.bootStrapIP))
for _, bootIP := range nDB.bootStrapIP {
// botostrap IPs are usually IP:port from the Join