diff --git a/Gopkg.lock b/Gopkg.lock index 5847bc2f..a74be697 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -15,7 +15,7 @@ name = "github.com/Azure/go-ansiterm" packages = [ ".", - "winterm" + "winterm", ] pruneopts = "NUT" revision = "d6e3b3328b783f23731bc4d058875b0371ff8109" @@ -55,7 +55,7 @@ "internal/schema2", "internal/timeout", "internal/wclayer", - "osversion" + "osversion", ] pruneopts = "NUT" revision = "f92b8fb9c92e17da496af5a69e3ee13fbe9916e1" @@ -67,7 +67,7 @@ name = "github.com/agl/ed25519" packages = [ ".", - "edwards25519" + "edwards25519", ] pruneopts = "NUT" revision = "5312a61534124124185d41f09206b9fef1d88403" @@ -142,7 +142,7 @@ "snapshots", "snapshots/proxy", "sys", - "version" + "version", ] pruneopts = "NUT" revision = "f2b6c31d0fa7f5541f6a37d525ed461b294d785f" @@ -155,7 +155,7 @@ "fs", "pathdriver", "syscallx", - "sysx" + "sysx", ] pruneopts = "NUT" revision = "004b46473808b3e7a4a3049c20e4376c91eb966d" @@ -219,15 +219,14 @@ "credentials", "driver", "driver/docker", - "utils/crud" + "utils/crud", ] pruneopts = "NUT" revision = "0ce7659aab8dbd37cc912ea64cb78f403534de42" version = "v0.3.2-beta1" [[projects]] - branch = "19.03" - digest = "1:e0d546e1b6582adce85a80829128887eb287f6d3bd5d7a9636b27df0798a71c5" + digest = "1:5f5253dd1a588922925933e105c1de2d1a221cf0aa42d5c08549a12d93493024" name = "github.com/docker/cli" packages = [ "cli", @@ -279,17 +278,17 @@ "opts", "service/logs", "templates", - "types" + "types", ] pruneopts = "UT" - revision = "5b38d82aa0767e32f53b5821a9a5044f20eeef29" + revision = "83751b978155dc889c35e0e49654f76e7cf8d951" [[projects]] digest = "1:47edc537d608c0ad4ef8e9cebfec7c74ccc0986af115ff53ea26b18b4605a878" name = "github.com/docker/cnab-to-oci" packages = [ "converter", - "remotes" + "remotes", ] pruneopts = "NUT" revision = "27701312d17158eea04c079e7ffcc75259741264" @@ -309,7 +308,7 @@ "api/compose/v1alpha3", "api/compose/v1beta1", "api/compose/v1beta2", - "api/labels" + "api/labels", ] pruneopts = "NUT" revision = "7a68f5c914c7e06d7a08dc71608f41811c91f0bc" @@ -334,7 +333,7 @@ "registry/client/transport", "registry/storage/cache", "registry/storage/cache/memory", - "uuid" + "uuid", ] pruneopts = "NUT" revision = "0d3efadf0154c2b8a4e7b6621fff9809655cc580" @@ -380,7 +379,7 @@ "pkg/term", "pkg/term/windows", "registry", - "registry/resumable" + "registry/resumable", ] pruneopts = "NUT" revision = "8a208a10de6a13ba2d9f65b9955d3594d9b14615" @@ -390,7 +389,7 @@ name = "github.com/docker/docker-credential-helpers" packages = [ "client", - "credentials" + "credentials", ] pruneopts = "NUT" revision = "5241b46610f2491efdf9d1c85f1ddf5b02f6d962" @@ -410,7 +409,7 @@ packages = [ "nat", "sockets", - "tlsconfig" + "tlsconfig", ] pruneopts = "NUT" revision = "7395e3f8aa162843a74ed6d48e79627d9792ac55" @@ -448,7 +447,7 @@ "api/defaults", "api/genericresource", "manager/raftselector", - "protobuf/plugin" + "protobuf/plugin", ] pruneopts = "NUT" revision = "18e7e58ea1a5ec016625a636d0d52500eea123bc" @@ -462,7 +461,7 @@ "bson", "internal/json", "internal/sasl", - "internal/scram" + "internal/scram", ] pruneopts = "NUT" revision = "eeefdecb41b842af6dc652aaea4026e8403e62df" @@ -491,7 +490,7 @@ "proto", "protoc-gen-gogo/descriptor", "sortkeys", - "types" + "types", ] pruneopts = "NUT" revision = "ba06b47c162d49f2af050fb4c75bcbc86a159d5c" @@ -505,7 +504,7 @@ "ptypes", "ptypes/any", "ptypes/duration", - "ptypes/timestamp" + "ptypes/timestamp", ] pruneopts = "NUT" revision = "b5d812f8a3706043e23a9cd5babf2e5423744d30" @@ -518,7 +517,7 @@ "cmp", "cmp/internal/diff", "cmp/internal/function", - "cmp/internal/value" + "cmp/internal/value", ] pruneopts = "NUT" revision = "3af367b6b30c263d47e8895973edcca9a49cf029" @@ -546,7 +545,7 @@ packages = [ "OpenAPIv2", "compiler", - "extensions" + "extensions", ] pruneopts = "NUT" revision = "7c663266750e7d82587642f65e60bc4083f1f84e" @@ -573,7 +572,7 @@ name = "github.com/hashicorp/golang-lru" packages = [ ".", - "simplelru" + "simplelru", ] pruneopts = "NUT" revision = "7087cb70de9f7a8bc0a10c375cb0d2280a8edf9c" @@ -689,7 +688,7 @@ packages = [ "identity", "specs-go", - "specs-go/v1" + "specs-go/v1", ] pruneopts = "NUT" revision = "d60099175f88c47cd379c4738d158884749ed235" @@ -700,7 +699,7 @@ name = "github.com/opencontainers/runc" packages = [ "libcontainer/system", - "libcontainer/user" + "libcontainer/user", ] pruneopts = "NUT" revision = "69ae5da6afdcaaf38285a10b36f362e41cb298d6" @@ -742,7 +741,7 @@ packages = [ "expfmt", "internal/bitbucket.org/ww/goautoneg", - "model" + "model", ] pruneopts = "NUT" revision = "cfeb6f9992ffa54aaa4f2170ade4067ee478b250" @@ -821,7 +820,7 @@ "tuf/data", "tuf/signed", "tuf/utils", - "tuf/validation" + "tuf/validation", ] pruneopts = "NUT" revision = "d6e1431feb32348e0650bf7551ac5cffd01d857b" @@ -864,7 +863,7 @@ name = "golang.org/x/crypto" packages = [ "pbkdf2", - "ssh/terminal" + "ssh/terminal", ] pruneopts = "NUT" revision = "38d8ce5564a5b71b2e3a00553993f1b9a7ae852f" @@ -883,7 +882,7 @@ "internal/socks", "internal/timeseries", "proxy", - "trace" + "trace", ] pruneopts = "NUT" revision = "eb5bcb51f2a31c7d5141d810b70815c05d9c9146" @@ -897,7 +896,7 @@ "google", "internal", "jws", - "jwt" + "jwt", ] pruneopts = "NUT" revision = "9f3314589c9a9136388751d9adae6b0ed400978a" @@ -908,7 +907,7 @@ name = "golang.org/x/sync" packages = [ "errgroup", - "semaphore" + "semaphore", ] pruneopts = "NUT" revision = "e225da77a7e68af35c70ccbf71af2b83e6acac3c" @@ -919,7 +918,7 @@ name = "golang.org/x/sys" packages = [ "unix", - "windows" + "windows", ] pruneopts = "NUT" revision = "4b34438f7a67ee5f45cc6132e2bad873a20324e9" @@ -942,7 +941,7 @@ "unicode/cldr", "unicode/norm", "unicode/rangetable", - "width" + "width", ] pruneopts = "NUT" revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0" @@ -977,7 +976,7 @@ "internal/modules", "internal/remote_api", "internal/urlfetch", - "urlfetch" + "urlfetch", ] pruneopts = "NUT" revision = "54a98f90d1c46b7731eb8fb305d2a321c30ef610" @@ -1026,7 +1025,7 @@ "resolver/passthrough", "stats", "status", - "tap" + "tap", ] pruneopts = "NUT" revision = "3507fb8e1a5ad030303c106fef3a47c9fdad16ad" @@ -1060,7 +1059,7 @@ "internal/difflib", "internal/format", "internal/source", - "x/subtest" + "x/subtest", ] pruneopts = "NUT" revision = "1083505acf35a0bd8a696b26837e1fb3187a7a83" @@ -1105,7 +1104,7 @@ "settings/v1alpha1", "storage/v1", "storage/v1alpha1", - "storage/v1beta1" + "storage/v1beta1", ] pruneopts = "NUT" revision = "kubernetes-1.14.1" @@ -1152,7 +1151,7 @@ "pkg/util/yaml", "pkg/version", "pkg/watch", - "third_party/forked/golang/reflect" + "third_party/forked/golang/reflect", ] pruneopts = "NUT" revision = "kubernetes-1.14.1" @@ -1225,7 +1224,7 @@ "util/homedir", "util/jsonpath", "util/keyutil", - "util/retry" + "util/retry", ] pruneopts = "NUT" revision = "kubernetes-1.14.1" @@ -1252,7 +1251,7 @@ packages = [ "buffer", "integer", - "trace" + "trace", ] pruneopts = "NUT" revision = "21c4ce38f2a793ec01e925ddc31216500183b773" @@ -1338,7 +1337,7 @@ "gotest.tools/icmd", "k8s.io/api/core/v1", "k8s.io/apimachinery/pkg/apis/meta/v1", - "k8s.io/client-go/kubernetes/typed/core/v1" + "k8s.io/client-go/kubernetes/typed/core/v1", ] solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index 8b6b7151..d5cd4954 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -37,7 +37,7 @@ required = ["github.com/wadey/gocovmerge"] [[override]] name = "github.com/docker/cli" - branch = "19.03" + revision = "83751b978155dc889c35e0e49654f76e7cf8d951" [[override]] name = "github.com/deislabs/cnab-go" diff --git a/vendor/github.com/docker/cli/AUTHORS b/vendor/github.com/docker/cli/AUTHORS index 04edcf79..ecb6251b 100644 --- a/vendor/github.com/docker/cli/AUTHORS +++ b/vendor/github.com/docker/cli/AUTHORS @@ -11,6 +11,7 @@ Abin Shahab Ace Tang Addam Hardy Adolfo Ochagavía +Adrian Plata Adrien Duermael Adrien Folie Ahmet Alp Balkan @@ -136,6 +137,7 @@ Dafydd Crosby dalanlan Damien Nadé Dan Cotora +Daniel Cassidy Daniel Dao Daniel Farrell Daniel Gasienica @@ -215,6 +217,7 @@ Felix Rabe Filip Jareš Flavio Crisciani Florian Klein +Forest Johnson Foysal Iqbal François Scala Fred Lifton @@ -231,6 +234,7 @@ George MacRorie George Xie Gianluca Borello Gildas Cuisinier +Goksu Toprak Gou Rao Grant Reaber Greg Pflaum @@ -351,6 +355,7 @@ Kara Alexandra Kareem Khazem Karthik Nayak Kat Samperi +Kathryn Spiers Katie McLaughlin Ke Xu Kei Ohmura @@ -372,7 +377,6 @@ Krasi Georgiev Kris-Mikael Krister Kun Zhang Kunal Kushwaha -Kyle Spiers Lachlan Cooper Lai Jiangshan Lars Kellogg-Stedman @@ -537,6 +541,7 @@ Qiang Huang Qinglan Peng qudongfang Raghavendra K T +Ravi Shekhar Jethani Ray Tsang Reficul Remy Suen @@ -553,6 +558,7 @@ Robin Naundorf Robin Speekenbrink Rodolfo Ortiz Rogelio Canedo +Rohan Verma Roland Kammerer Roman Dudin Rory Hunter @@ -701,6 +707,7 @@ Yuan Sun Yue Zhang Yunxiang Huang Zachary Romero +Zander Mackie zebrilee Zhang Kun Zhang Wei diff --git a/vendor/github.com/docker/cli/NOTICE b/vendor/github.com/docker/cli/NOTICE index 0c74e15b..58b19b6d 100644 --- a/vendor/github.com/docker/cli/NOTICE +++ b/vendor/github.com/docker/cli/NOTICE @@ -3,7 +3,7 @@ Copyright 2012-2017 Docker, Inc. This product includes software developed at Docker, Inc. (https://www.docker.com). -This product contains software (https://github.com/kr/pty) developed +This product contains software (https://github.com/creack/pty) developed by Keith Rarick, licensed under the MIT License. The following is courtesy of our legal counsel: diff --git a/vendor/github.com/docker/cli/cli/command/formatter/container.go b/vendor/github.com/docker/cli/cli/command/formatter/container.go index e7e98cb9..7f216fcf 100644 --- a/vendor/github.com/docker/cli/cli/command/formatter/container.go +++ b/vendor/github.com/docker/cli/cli/command/formatter/container.go @@ -44,6 +44,7 @@ func NewContainerFormat(source string, quiet bool, size bool) Format { image: {{.Image}} command: {{.Command}} created_at: {{.CreatedAt}} +state: {{- pad .State 1 0}} status: {{- pad .Status 1 0}} names: {{.Names}} labels: {{- pad .Labels 1 0}} @@ -87,6 +88,7 @@ func newContainerContext() *containerContext { "CreatedAt": CreatedAtHeader, "RunningFor": runningForHeader, "Ports": PortsHeader, + "State": StateHeader, "Status": StatusHeader, "Size": SizeHeader, "Labels": LabelsHeader, @@ -169,6 +171,10 @@ func (c *containerContext) Ports() string { return DisplayablePorts(c.c.Ports) } +func (c *containerContext) State() string { + return c.c.State +} + func (c *containerContext) Status() string { return c.c.Status } diff --git a/vendor/github.com/docker/cli/cli/command/formatter/custom.go b/vendor/github.com/docker/cli/cli/command/formatter/custom.go index 6be9ed7a..bb46b225 100644 --- a/vendor/github.com/docker/cli/cli/command/formatter/custom.go +++ b/vendor/github.com/docker/cli/cli/command/formatter/custom.go @@ -12,6 +12,7 @@ const ( DescriptionHeader = "DESCRIPTION" DriverHeader = "DRIVER" ScopeHeader = "SCOPE" + StateHeader = "STATE" StatusHeader = "STATUS" PortsHeader = "PORTS" ImageHeader = "IMAGE" diff --git a/vendor/github.com/docker/cli/cli/command/stack/swarm/services.go b/vendor/github.com/docker/cli/cli/command/stack/swarm/services.go index cd7208f8..15a48e78 100644 --- a/vendor/github.com/docker/cli/cli/command/stack/swarm/services.go +++ b/vendor/github.com/docker/cli/cli/command/stack/swarm/services.go @@ -3,6 +3,7 @@ package swarm import ( "context" "fmt" + "sort" "github.com/docker/cli/cli/command" "github.com/docker/cli/cli/command/service" @@ -10,6 +11,7 @@ import ( "github.com/docker/cli/cli/command/stack/options" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" + "vbom.ml/util/sortorder" ) // RunServices is the swarm implementation of docker stack services @@ -29,6 +31,9 @@ func RunServices(dockerCli command.Cli, opts options.Services) error { return nil } + sort.Slice(services, func(i, j int) bool { + return sortorder.NaturalLess(services[i].Spec.Name, services[j].Spec.Name) + }) info := map[string]service.ListInfo{} if !opts.Quiet { taskFilter := filters.NewArgs() diff --git a/vendor/github.com/docker/cli/cli/compose/loader/full-example.yml b/vendor/github.com/docker/cli/cli/compose/loader/full-example.yml index f452812a..a2efd9de 100644 --- a/vendor/github.com/docker/cli/cli/compose/loader/full-example.yml +++ b/vendor/github.com/docker/cli/cli/compose/loader/full-example.yml @@ -1,4 +1,4 @@ -version: "3.8" +version: "3.9" services: foo: diff --git a/vendor/github.com/docker/cli/cli/compose/loader/loader.go b/vendor/github.com/docker/cli/cli/compose/loader/loader.go index f5787126..a17105f0 100644 --- a/vendor/github.com/docker/cli/cli/compose/loader/loader.go +++ b/vendor/github.com/docker/cli/cli/compose/loader/loader.go @@ -32,6 +32,14 @@ type Options struct { SkipInterpolation bool // Interpolation options Interpolate *interp.Options + // Discard 'env_file' entries after resolving to 'environment' section + discardEnvFiles bool +} + +// WithDiscardEnvFiles sets the Options to discard the `env_file` section after resolving to +// the `environment` section +func WithDiscardEnvFiles(opts *Options) { + opts.discardEnvFiles = true } // ParseYAML reads the bytes from a file, parses the bytes into a mapping @@ -105,6 +113,11 @@ func Load(configDetails types.ConfigDetails, options ...func(*Options)) (*types. return nil, err } cfg.Filename = file.Filename + if opts.discardEnvFiles { + for i := range cfg.Services { + cfg.Services[i].EnvFile = nil + } + } configs = append(configs, cfg) } @@ -479,12 +492,13 @@ func resolveVolumePaths(volumes []types.ServiceVolumeConfig, workingDir string, } filePath := expandUser(volume.Source, lookupEnv) - // Check for a Unix absolute path first, to handle a Windows client - // with a Unix daemon. This handles a Windows client connecting to a - // Unix daemon. Note that this is not required for Docker for Windows - // when specifying a local Windows path, because Docker for Windows - // translates the Windows path into a valid path within the VM. - if !path.IsAbs(filePath) { + // Check if source is an absolute path (either Unix or Windows), to + // handle a Windows client with a Unix daemon or vice-versa. + // + // Note that this is not required for Docker for Windows when specifying + // a local Windows path, because Docker for Windows translates the Windows + // path into a valid path within the VM. + if !path.IsAbs(filePath) && !isAbs(filePath) { filePath = absPath(workingDir, filePath) } volume.Source = filePath diff --git a/vendor/github.com/docker/cli/cli/compose/loader/windows_path.go b/vendor/github.com/docker/cli/cli/compose/loader/windows_path.go new file mode 100644 index 00000000..eaf41bf7 --- /dev/null +++ b/vendor/github.com/docker/cli/cli/compose/loader/windows_path.go @@ -0,0 +1,66 @@ +package loader + +// Copyright 2010 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. +// https://github.com/golang/go/blob/master/LICENSE + +// This file contains utilities to check for Windows absolute paths on Linux. +// The code in this file was largely copied from the Golang filepath package +// https://github.com/golang/go/blob/1d0e94b1e13d5e8a323a63cd1cc1ef95290c9c36/src/path/filepath/path_windows.go#L12-L65 + +func isSlash(c uint8) bool { + return c == '\\' || c == '/' +} + +// isAbs reports whether the path is a Windows absolute path. +func isAbs(path string) (b bool) { + l := volumeNameLen(path) + if l == 0 { + return false + } + path = path[l:] + if path == "" { + return false + } + return isSlash(path[0]) +} + +// volumeNameLen returns length of the leading volume name on Windows. +// It returns 0 elsewhere. +// nolint: gocyclo +func volumeNameLen(path string) int { + if len(path) < 2 { + return 0 + } + // with drive letter + c := path[0] + if path[1] == ':' && ('a' <= c && c <= 'z' || 'A' <= c && c <= 'Z') { + return 2 + } + // is it UNC? https://msdn.microsoft.com/en-us/library/windows/desktop/aa365247(v=vs.85).aspx + if l := len(path); l >= 5 && isSlash(path[0]) && isSlash(path[1]) && + !isSlash(path[2]) && path[2] != '.' { + // first, leading `\\` and next shouldn't be `\`. its server name. + for n := 3; n < l-1; n++ { + // second, next '\' shouldn't be repeated. + if isSlash(path[n]) { + n++ + // third, following something characters. its share name. + if !isSlash(path[n]) { + if path[n] == '.' { + break + } + for ; n < l; n++ { + if isSlash(path[n]) { + break + } + } + return n + } + break + } + } + } + return 0 +} diff --git a/vendor/github.com/docker/cli/cli/compose/schema/bindata.go b/vendor/github.com/docker/cli/cli/compose/schema/bindata.go index 581e9d50..9efa2435 100644 --- a/vendor/github.com/docker/cli/cli/compose/schema/bindata.go +++ b/vendor/github.com/docker/cli/cli/compose/schema/bindata.go @@ -552,6 +552,50 @@ ean7MQBPP+U4w19V/z+t/hsAAP//Fd/bF0ZHAAA= `, }, + "/data/config_schema_v3.9.json": { + local: "data/config_schema_v3.9.json", + size: 18246, + modtime: 1518458244, + compressed: ` +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 +`, + }, + "/": { isDir: true, local: "", diff --git a/vendor/github.com/docker/cli/cli/context/docker/load.go b/vendor/github.com/docker/cli/cli/context/docker/load.go index 126fa2f2..c85d4b6d 100644 --- a/vendor/github.com/docker/cli/cli/context/docker/load.go +++ b/vendor/github.com/docker/cli/cli/context/docker/load.go @@ -104,8 +104,8 @@ func (c *Endpoint) ClientOpts() ([]client.Opt, error) { return nil, err } result = append(result, - client.WithHost(c.Host), withHTTPClient(tlsConfig), + client.WithHost(c.Host), ) } else { @@ -127,6 +127,8 @@ func (c *Endpoint) ClientOpts() ([]client.Opt, error) { version := os.Getenv("DOCKER_API_VERSION") if version != "" { result = append(result, client.WithVersion(version)) + } else { + result = append(result, client.WithAPIVersionNegotiation()) } return result, nil }