Merge pull request #374 from thaJeztah/19.03_backport_add_tc_dynamic_ingress_network
[19.03 backport] Add TC to check dynamic subnet for ingress network
diff --git a/integration-cli/docker_cli_start_test.go b/integration-cli/docker_cli_start_test.go
index 9d59e83..72a5d77 100644
--- a/integration-cli/docker_cli_start_test.go
+++ b/integration-cli/docker_cli_start_test.go
@@ -2,11 +2,14 @@
import (
"fmt"
+ "runtime"
+ "strconv"
"strings"
"testing"
"time"
"github.com/docker/docker/integration-cli/cli"
+ "github.com/docker/docker/pkg/parsers/kernel"
"gotest.tools/assert"
"gotest.tools/icmd"
)
@@ -186,6 +189,18 @@
}
func (s *DockerSuite) TestStartReturnCorrectExitCode(c *testing.T) {
+ // Note we parse kernel.GetKernelVersion rather than system.GetOSVersion
+ // as test binaries aren't manifested, so would otherwise report the wrong
+ // build number.
+ if runtime.GOOS == "windows" {
+ v, err := kernel.GetKernelVersion()
+ assert.NilError(c, err)
+ build, _ := strconv.Atoi(strings.Split(strings.SplitN(v.String(), " ", 3)[2][1:], ".")[0])
+ if build < 16299 {
+ c.Skip("FLAKY on Windows RS1, see #38521")
+ }
+ }
+
dockerCmd(c, "create", "--restart=on-failure:2", "--name", "withRestart", "busybox", "sh", "-c", "exit 11")
dockerCmd(c, "create", "--rm", "--name", "withRm", "busybox", "sh", "-c", "exit 12")
diff --git a/vendor.conf b/vendor.conf
index fd6ef4b..4882b37 100644
--- a/vendor.conf
+++ b/vendor.conf
@@ -26,7 +26,7 @@
golang.org/x/sync e225da77a7e68af35c70ccbf71af2b83e6acac3c
# buildkit
-github.com/moby/buildkit ae10b292fefb00e0fbf9fecd1419c5f252e58895
+github.com/moby/buildkit ff93519eefb7d4b2ee67dd78166cd5d0f52f8980
github.com/tonistiigi/fsutil 3d2716dd0a4d06ff854241c7e8b6f3f904e1719f
github.com/grpc-ecosystem/grpc-opentracing 8e809c8a86450a29b90dcc9efbf062d0fe6d9746
github.com/opentracing/opentracing-go 1361b9cd60be79c4c3a7fa9841b3c132e40066a7
diff --git a/vendor/github.com/moby/buildkit/frontend/dockerfile/dockerfile2llb/convert.go b/vendor/github.com/moby/buildkit/frontend/dockerfile/dockerfile2llb/convert.go
index 8cec181..bb21476 100644
--- a/vendor/github.com/moby/buildkit/frontend/dockerfile/dockerfile2llb/convert.go
+++ b/vendor/github.com/moby/buildkit/frontend/dockerfile/dockerfile2llb/convert.go
@@ -1202,31 +1202,13 @@
if p == "/" {
return nil
}
- pathSlice = append(pathSlice, p)
+ pathSlice = append(pathSlice, path.Join(".", p))
}
- toDelete := map[string]struct{}{}
- for i := range pathSlice {
- for j := range pathSlice {
- if i == j {
- continue
- }
- if strings.HasPrefix(pathSlice[j], pathSlice[i]+"/") {
- delete(paths, pathSlice[j])
- }
- }
- }
-
- toSort := make([]string, 0, len(paths))
- for p := range paths {
- if _, ok := toDelete[p]; !ok {
- toSort = append(toSort, path.Join(".", p))
- }
- }
- sort.Slice(toSort, func(i, j int) bool {
- return toSort[i] < toSort[j]
+ sort.Slice(pathSlice, func(i, j int) bool {
+ return pathSlice[i] < pathSlice[j]
})
- return toSort
+ return pathSlice
}
func proxyEnvFromBuildArgs(args map[string]string) *llb.ProxyEnv {
diff --git a/vendor/github.com/moby/buildkit/session/sshforward/ssh.go b/vendor/github.com/moby/buildkit/session/sshforward/ssh.go
index 0001f59..a7a4c2e 100644
--- a/vendor/github.com/moby/buildkit/session/sshforward/ssh.go
+++ b/vendor/github.com/moby/buildkit/session/sshforward/ssh.go
@@ -75,6 +75,10 @@
}
}()
+ if err := os.Chmod(dir, 0711); err != nil {
+ return "", nil, errors.WithStack(err)
+ }
+
sockPath = filepath.Join(dir, "ssh_auth_sock")
l, err := net.Listen("unix", sockPath)
diff --git a/vendor/github.com/moby/buildkit/solver/llbsolver/ops/exec.go b/vendor/github.com/moby/buildkit/solver/llbsolver/ops/exec.go
index aa2d6fa..324b442 100644
--- a/vendor/github.com/moby/buildkit/solver/llbsolver/ops/exec.go
+++ b/vendor/github.com/moby/buildkit/solver/llbsolver/ops/exec.go
@@ -525,7 +525,7 @@
return []mount.Mount{{
Type: "bind",
Source: fp,
- Options: []string{"ro", "rbind"},
+ Options: []string{"ro", "rbind", "nodev", "nosuid", "noexec"},
}}, cleanup, nil
}
