Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
This commit is contained in:
Ulysses Souza 2019-09-23 18:56:18 +02:00
Родитель dc0d83c861
Коммит c148977613
12 изменённых файлов: 196 добавлений и 52 удалений

81
Gopkg.lock сгенерированный
Просмотреть файл

@ -15,7 +15,7 @@
name = "github.com/Azure/go-ansiterm" name = "github.com/Azure/go-ansiterm"
packages = [ packages = [
".", ".",
"winterm" "winterm",
] ]
pruneopts = "NUT" pruneopts = "NUT"
revision = "d6e3b3328b783f23731bc4d058875b0371ff8109" revision = "d6e3b3328b783f23731bc4d058875b0371ff8109"
@ -55,7 +55,7 @@
"internal/schema2", "internal/schema2",
"internal/timeout", "internal/timeout",
"internal/wclayer", "internal/wclayer",
"osversion" "osversion",
] ]
pruneopts = "NUT" pruneopts = "NUT"
revision = "f92b8fb9c92e17da496af5a69e3ee13fbe9916e1" revision = "f92b8fb9c92e17da496af5a69e3ee13fbe9916e1"
@ -67,7 +67,7 @@
name = "github.com/agl/ed25519" name = "github.com/agl/ed25519"
packages = [ packages = [
".", ".",
"edwards25519" "edwards25519",
] ]
pruneopts = "NUT" pruneopts = "NUT"
revision = "5312a61534124124185d41f09206b9fef1d88403" revision = "5312a61534124124185d41f09206b9fef1d88403"
@ -142,7 +142,7 @@
"snapshots", "snapshots",
"snapshots/proxy", "snapshots/proxy",
"sys", "sys",
"version" "version",
] ]
pruneopts = "NUT" pruneopts = "NUT"
revision = "f2b6c31d0fa7f5541f6a37d525ed461b294d785f" revision = "f2b6c31d0fa7f5541f6a37d525ed461b294d785f"
@ -155,7 +155,7 @@
"fs", "fs",
"pathdriver", "pathdriver",
"syscallx", "syscallx",
"sysx" "sysx",
] ]
pruneopts = "NUT" pruneopts = "NUT"
revision = "004b46473808b3e7a4a3049c20e4376c91eb966d" revision = "004b46473808b3e7a4a3049c20e4376c91eb966d"
@ -219,15 +219,14 @@
"credentials", "credentials",
"driver", "driver",
"driver/docker", "driver/docker",
"utils/crud" "utils/crud",
] ]
pruneopts = "NUT" pruneopts = "NUT"
revision = "0ce7659aab8dbd37cc912ea64cb78f403534de42" revision = "0ce7659aab8dbd37cc912ea64cb78f403534de42"
version = "v0.3.2-beta1" version = "v0.3.2-beta1"
[[projects]] [[projects]]
branch = "19.03" digest = "1:5f5253dd1a588922925933e105c1de2d1a221cf0aa42d5c08549a12d93493024"
digest = "1:e0d546e1b6582adce85a80829128887eb287f6d3bd5d7a9636b27df0798a71c5"
name = "github.com/docker/cli" name = "github.com/docker/cli"
packages = [ packages = [
"cli", "cli",
@ -279,17 +278,17 @@
"opts", "opts",
"service/logs", "service/logs",
"templates", "templates",
"types" "types",
] ]
pruneopts = "UT" pruneopts = "UT"
revision = "5b38d82aa0767e32f53b5821a9a5044f20eeef29" revision = "83751b978155dc889c35e0e49654f76e7cf8d951"
[[projects]] [[projects]]
digest = "1:47edc537d608c0ad4ef8e9cebfec7c74ccc0986af115ff53ea26b18b4605a878" digest = "1:47edc537d608c0ad4ef8e9cebfec7c74ccc0986af115ff53ea26b18b4605a878"
name = "github.com/docker/cnab-to-oci" name = "github.com/docker/cnab-to-oci"
packages = [ packages = [
"converter", "converter",
"remotes" "remotes",
] ]
pruneopts = "NUT" pruneopts = "NUT"
revision = "27701312d17158eea04c079e7ffcc75259741264" revision = "27701312d17158eea04c079e7ffcc75259741264"
@ -309,7 +308,7 @@
"api/compose/v1alpha3", "api/compose/v1alpha3",
"api/compose/v1beta1", "api/compose/v1beta1",
"api/compose/v1beta2", "api/compose/v1beta2",
"api/labels" "api/labels",
] ]
pruneopts = "NUT" pruneopts = "NUT"
revision = "7a68f5c914c7e06d7a08dc71608f41811c91f0bc" revision = "7a68f5c914c7e06d7a08dc71608f41811c91f0bc"
@ -334,7 +333,7 @@
"registry/client/transport", "registry/client/transport",
"registry/storage/cache", "registry/storage/cache",
"registry/storage/cache/memory", "registry/storage/cache/memory",
"uuid" "uuid",
] ]
pruneopts = "NUT" pruneopts = "NUT"
revision = "0d3efadf0154c2b8a4e7b6621fff9809655cc580" revision = "0d3efadf0154c2b8a4e7b6621fff9809655cc580"
@ -380,7 +379,7 @@
"pkg/term", "pkg/term",
"pkg/term/windows", "pkg/term/windows",
"registry", "registry",
"registry/resumable" "registry/resumable",
] ]
pruneopts = "NUT" pruneopts = "NUT"
revision = "8a208a10de6a13ba2d9f65b9955d3594d9b14615" revision = "8a208a10de6a13ba2d9f65b9955d3594d9b14615"
@ -390,7 +389,7 @@
name = "github.com/docker/docker-credential-helpers" name = "github.com/docker/docker-credential-helpers"
packages = [ packages = [
"client", "client",
"credentials" "credentials",
] ]
pruneopts = "NUT" pruneopts = "NUT"
revision = "5241b46610f2491efdf9d1c85f1ddf5b02f6d962" revision = "5241b46610f2491efdf9d1c85f1ddf5b02f6d962"
@ -410,7 +409,7 @@
packages = [ packages = [
"nat", "nat",
"sockets", "sockets",
"tlsconfig" "tlsconfig",
] ]
pruneopts = "NUT" pruneopts = "NUT"
revision = "7395e3f8aa162843a74ed6d48e79627d9792ac55" revision = "7395e3f8aa162843a74ed6d48e79627d9792ac55"
@ -448,7 +447,7 @@
"api/defaults", "api/defaults",
"api/genericresource", "api/genericresource",
"manager/raftselector", "manager/raftselector",
"protobuf/plugin" "protobuf/plugin",
] ]
pruneopts = "NUT" pruneopts = "NUT"
revision = "18e7e58ea1a5ec016625a636d0d52500eea123bc" revision = "18e7e58ea1a5ec016625a636d0d52500eea123bc"
@ -462,7 +461,7 @@
"bson", "bson",
"internal/json", "internal/json",
"internal/sasl", "internal/sasl",
"internal/scram" "internal/scram",
] ]
pruneopts = "NUT" pruneopts = "NUT"
revision = "eeefdecb41b842af6dc652aaea4026e8403e62df" revision = "eeefdecb41b842af6dc652aaea4026e8403e62df"
@ -491,7 +490,7 @@
"proto", "proto",
"protoc-gen-gogo/descriptor", "protoc-gen-gogo/descriptor",
"sortkeys", "sortkeys",
"types" "types",
] ]
pruneopts = "NUT" pruneopts = "NUT"
revision = "ba06b47c162d49f2af050fb4c75bcbc86a159d5c" revision = "ba06b47c162d49f2af050fb4c75bcbc86a159d5c"
@ -505,7 +504,7 @@
"ptypes", "ptypes",
"ptypes/any", "ptypes/any",
"ptypes/duration", "ptypes/duration",
"ptypes/timestamp" "ptypes/timestamp",
] ]
pruneopts = "NUT" pruneopts = "NUT"
revision = "b5d812f8a3706043e23a9cd5babf2e5423744d30" revision = "b5d812f8a3706043e23a9cd5babf2e5423744d30"
@ -518,7 +517,7 @@
"cmp", "cmp",
"cmp/internal/diff", "cmp/internal/diff",
"cmp/internal/function", "cmp/internal/function",
"cmp/internal/value" "cmp/internal/value",
] ]
pruneopts = "NUT" pruneopts = "NUT"
revision = "3af367b6b30c263d47e8895973edcca9a49cf029" revision = "3af367b6b30c263d47e8895973edcca9a49cf029"
@ -546,7 +545,7 @@
packages = [ packages = [
"OpenAPIv2", "OpenAPIv2",
"compiler", "compiler",
"extensions" "extensions",
] ]
pruneopts = "NUT" pruneopts = "NUT"
revision = "7c663266750e7d82587642f65e60bc4083f1f84e" revision = "7c663266750e7d82587642f65e60bc4083f1f84e"
@ -573,7 +572,7 @@
name = "github.com/hashicorp/golang-lru" name = "github.com/hashicorp/golang-lru"
packages = [ packages = [
".", ".",
"simplelru" "simplelru",
] ]
pruneopts = "NUT" pruneopts = "NUT"
revision = "7087cb70de9f7a8bc0a10c375cb0d2280a8edf9c" revision = "7087cb70de9f7a8bc0a10c375cb0d2280a8edf9c"
@ -689,7 +688,7 @@
packages = [ packages = [
"identity", "identity",
"specs-go", "specs-go",
"specs-go/v1" "specs-go/v1",
] ]
pruneopts = "NUT" pruneopts = "NUT"
revision = "d60099175f88c47cd379c4738d158884749ed235" revision = "d60099175f88c47cd379c4738d158884749ed235"
@ -700,7 +699,7 @@
name = "github.com/opencontainers/runc" name = "github.com/opencontainers/runc"
packages = [ packages = [
"libcontainer/system", "libcontainer/system",
"libcontainer/user" "libcontainer/user",
] ]
pruneopts = "NUT" pruneopts = "NUT"
revision = "69ae5da6afdcaaf38285a10b36f362e41cb298d6" revision = "69ae5da6afdcaaf38285a10b36f362e41cb298d6"
@ -742,7 +741,7 @@
packages = [ packages = [
"expfmt", "expfmt",
"internal/bitbucket.org/ww/goautoneg", "internal/bitbucket.org/ww/goautoneg",
"model" "model",
] ]
pruneopts = "NUT" pruneopts = "NUT"
revision = "cfeb6f9992ffa54aaa4f2170ade4067ee478b250" revision = "cfeb6f9992ffa54aaa4f2170ade4067ee478b250"
@ -821,7 +820,7 @@
"tuf/data", "tuf/data",
"tuf/signed", "tuf/signed",
"tuf/utils", "tuf/utils",
"tuf/validation" "tuf/validation",
] ]
pruneopts = "NUT" pruneopts = "NUT"
revision = "d6e1431feb32348e0650bf7551ac5cffd01d857b" revision = "d6e1431feb32348e0650bf7551ac5cffd01d857b"
@ -864,7 +863,7 @@
name = "golang.org/x/crypto" name = "golang.org/x/crypto"
packages = [ packages = [
"pbkdf2", "pbkdf2",
"ssh/terminal" "ssh/terminal",
] ]
pruneopts = "NUT" pruneopts = "NUT"
revision = "38d8ce5564a5b71b2e3a00553993f1b9a7ae852f" revision = "38d8ce5564a5b71b2e3a00553993f1b9a7ae852f"
@ -883,7 +882,7 @@
"internal/socks", "internal/socks",
"internal/timeseries", "internal/timeseries",
"proxy", "proxy",
"trace" "trace",
] ]
pruneopts = "NUT" pruneopts = "NUT"
revision = "eb5bcb51f2a31c7d5141d810b70815c05d9c9146" revision = "eb5bcb51f2a31c7d5141d810b70815c05d9c9146"
@ -897,7 +896,7 @@
"google", "google",
"internal", "internal",
"jws", "jws",
"jwt" "jwt",
] ]
pruneopts = "NUT" pruneopts = "NUT"
revision = "9f3314589c9a9136388751d9adae6b0ed400978a" revision = "9f3314589c9a9136388751d9adae6b0ed400978a"
@ -908,7 +907,7 @@
name = "golang.org/x/sync" name = "golang.org/x/sync"
packages = [ packages = [
"errgroup", "errgroup",
"semaphore" "semaphore",
] ]
pruneopts = "NUT" pruneopts = "NUT"
revision = "e225da77a7e68af35c70ccbf71af2b83e6acac3c" revision = "e225da77a7e68af35c70ccbf71af2b83e6acac3c"
@ -919,7 +918,7 @@
name = "golang.org/x/sys" name = "golang.org/x/sys"
packages = [ packages = [
"unix", "unix",
"windows" "windows",
] ]
pruneopts = "NUT" pruneopts = "NUT"
revision = "4b34438f7a67ee5f45cc6132e2bad873a20324e9" revision = "4b34438f7a67ee5f45cc6132e2bad873a20324e9"
@ -942,7 +941,7 @@
"unicode/cldr", "unicode/cldr",
"unicode/norm", "unicode/norm",
"unicode/rangetable", "unicode/rangetable",
"width" "width",
] ]
pruneopts = "NUT" pruneopts = "NUT"
revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0" revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"
@ -977,7 +976,7 @@
"internal/modules", "internal/modules",
"internal/remote_api", "internal/remote_api",
"internal/urlfetch", "internal/urlfetch",
"urlfetch" "urlfetch",
] ]
pruneopts = "NUT" pruneopts = "NUT"
revision = "54a98f90d1c46b7731eb8fb305d2a321c30ef610" revision = "54a98f90d1c46b7731eb8fb305d2a321c30ef610"
@ -1026,7 +1025,7 @@
"resolver/passthrough", "resolver/passthrough",
"stats", "stats",
"status", "status",
"tap" "tap",
] ]
pruneopts = "NUT" pruneopts = "NUT"
revision = "3507fb8e1a5ad030303c106fef3a47c9fdad16ad" revision = "3507fb8e1a5ad030303c106fef3a47c9fdad16ad"
@ -1060,7 +1059,7 @@
"internal/difflib", "internal/difflib",
"internal/format", "internal/format",
"internal/source", "internal/source",
"x/subtest" "x/subtest",
] ]
pruneopts = "NUT" pruneopts = "NUT"
revision = "1083505acf35a0bd8a696b26837e1fb3187a7a83" revision = "1083505acf35a0bd8a696b26837e1fb3187a7a83"
@ -1105,7 +1104,7 @@
"settings/v1alpha1", "settings/v1alpha1",
"storage/v1", "storage/v1",
"storage/v1alpha1", "storage/v1alpha1",
"storage/v1beta1" "storage/v1beta1",
] ]
pruneopts = "NUT" pruneopts = "NUT"
revision = "kubernetes-1.14.1" revision = "kubernetes-1.14.1"
@ -1152,7 +1151,7 @@
"pkg/util/yaml", "pkg/util/yaml",
"pkg/version", "pkg/version",
"pkg/watch", "pkg/watch",
"third_party/forked/golang/reflect" "third_party/forked/golang/reflect",
] ]
pruneopts = "NUT" pruneopts = "NUT"
revision = "kubernetes-1.14.1" revision = "kubernetes-1.14.1"
@ -1225,7 +1224,7 @@
"util/homedir", "util/homedir",
"util/jsonpath", "util/jsonpath",
"util/keyutil", "util/keyutil",
"util/retry" "util/retry",
] ]
pruneopts = "NUT" pruneopts = "NUT"
revision = "kubernetes-1.14.1" revision = "kubernetes-1.14.1"
@ -1252,7 +1251,7 @@
packages = [ packages = [
"buffer", "buffer",
"integer", "integer",
"trace" "trace",
] ]
pruneopts = "NUT" pruneopts = "NUT"
revision = "21c4ce38f2a793ec01e925ddc31216500183b773" revision = "21c4ce38f2a793ec01e925ddc31216500183b773"
@ -1338,7 +1337,7 @@
"gotest.tools/icmd", "gotest.tools/icmd",
"k8s.io/api/core/v1", "k8s.io/api/core/v1",
"k8s.io/apimachinery/pkg/apis/meta/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-name = "gps-cdcl"
solver-version = 1 solver-version = 1

Просмотреть файл

@ -37,7 +37,7 @@ required = ["github.com/wadey/gocovmerge"]
[[override]] [[override]]
name = "github.com/docker/cli" name = "github.com/docker/cli"
branch = "19.03" revision = "83751b978155dc889c35e0e49654f76e7cf8d951"
[[override]] [[override]]
name = "github.com/deislabs/cnab-go" name = "github.com/deislabs/cnab-go"

9
vendor/github.com/docker/cli/AUTHORS сгенерированный поставляемый
Просмотреть файл

@ -11,6 +11,7 @@ Abin Shahab <ashahab@altiscale.com>
Ace Tang <aceapril@126.com> Ace Tang <aceapril@126.com>
Addam Hardy <addam.hardy@gmail.com> Addam Hardy <addam.hardy@gmail.com>
Adolfo Ochagavía <aochagavia92@gmail.com> Adolfo Ochagavía <aochagavia92@gmail.com>
Adrian Plata <adrian.plata@docker.com>
Adrien Duermael <adrien@duermael.com> Adrien Duermael <adrien@duermael.com>
Adrien Folie <folie.adrien@gmail.com> Adrien Folie <folie.adrien@gmail.com>
Ahmet Alp Balkan <ahmetb@microsoft.com> Ahmet Alp Balkan <ahmetb@microsoft.com>
@ -136,6 +137,7 @@ Dafydd Crosby <dtcrsby@gmail.com>
dalanlan <dalanlan925@gmail.com> dalanlan <dalanlan925@gmail.com>
Damien Nadé <github@livna.org> Damien Nadé <github@livna.org>
Dan Cotora <dan@bluevision.ro> Dan Cotora <dan@bluevision.ro>
Daniel Cassidy <mail@danielcassidy.me.uk>
Daniel Dao <dqminh@cloudflare.com> Daniel Dao <dqminh@cloudflare.com>
Daniel Farrell <dfarrell@redhat.com> Daniel Farrell <dfarrell@redhat.com>
Daniel Gasienica <daniel@gasienica.ch> Daniel Gasienica <daniel@gasienica.ch>
@ -215,6 +217,7 @@ Felix Rabe <felix@rabe.io>
Filip Jareš <filipjares@gmail.com> Filip Jareš <filipjares@gmail.com>
Flavio Crisciani <flavio.crisciani@docker.com> Flavio Crisciani <flavio.crisciani@docker.com>
Florian Klein <florian.klein@free.fr> Florian Klein <florian.klein@free.fr>
Forest Johnson <fjohnson@peoplenetonline.com>
Foysal Iqbal <foysal.iqbal.fb@gmail.com> Foysal Iqbal <foysal.iqbal.fb@gmail.com>
François Scala <francois.scala@swiss-as.com> François Scala <francois.scala@swiss-as.com>
Fred Lifton <fred.lifton@docker.com> Fred Lifton <fred.lifton@docker.com>
@ -231,6 +234,7 @@ George MacRorie <gmacr31@gmail.com>
George Xie <georgexsh@gmail.com> George Xie <georgexsh@gmail.com>
Gianluca Borello <g.borello@gmail.com> Gianluca Borello <g.borello@gmail.com>
Gildas Cuisinier <gildas.cuisinier@gcuisinier.net> Gildas Cuisinier <gildas.cuisinier@gcuisinier.net>
Goksu Toprak <goksu.toprak@docker.com>
Gou Rao <gou@portworx.com> Gou Rao <gou@portworx.com>
Grant Reaber <grant.reaber@gmail.com> Grant Reaber <grant.reaber@gmail.com>
Greg Pflaum <gpflaum@users.noreply.github.com> Greg Pflaum <gpflaum@users.noreply.github.com>
@ -351,6 +355,7 @@ Kara Alexandra <kalexandra@us.ibm.com>
Kareem Khazem <karkhaz@karkhaz.com> Kareem Khazem <karkhaz@karkhaz.com>
Karthik Nayak <Karthik.188@gmail.com> Karthik Nayak <Karthik.188@gmail.com>
Kat Samperi <kat.samperi@gmail.com> Kat Samperi <kat.samperi@gmail.com>
Kathryn Spiers <kathryn@spiers.me>
Katie McLaughlin <katie@glasnt.com> Katie McLaughlin <katie@glasnt.com>
Ke Xu <leonhartx.k@gmail.com> Ke Xu <leonhartx.k@gmail.com>
Kei Ohmura <ohmura.kei@gmail.com> Kei Ohmura <ohmura.kei@gmail.com>
@ -372,7 +377,6 @@ Krasi Georgiev <krasi@vip-consult.solutions>
Kris-Mikael Krister <krismikael@protonmail.com> Kris-Mikael Krister <krismikael@protonmail.com>
Kun Zhang <zkazure@gmail.com> Kun Zhang <zkazure@gmail.com>
Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp> Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
Kyle Spiers <kyle@spiers.me>
Lachlan Cooper <lachlancooper@gmail.com> Lachlan Cooper <lachlancooper@gmail.com>
Lai Jiangshan <jiangshanlai@gmail.com> Lai Jiangshan <jiangshanlai@gmail.com>
Lars Kellogg-Stedman <lars@redhat.com> Lars Kellogg-Stedman <lars@redhat.com>
@ -537,6 +541,7 @@ Qiang Huang <h.huangqiang@huawei.com>
Qinglan Peng <qinglanpeng@zju.edu.cn> Qinglan Peng <qinglanpeng@zju.edu.cn>
qudongfang <qudongfang@gmail.com> qudongfang <qudongfang@gmail.com>
Raghavendra K T <raghavendra.kt@linux.vnet.ibm.com> Raghavendra K T <raghavendra.kt@linux.vnet.ibm.com>
Ravi Shekhar Jethani <rsjethani@gmail.com>
Ray Tsang <rayt@google.com> Ray Tsang <rayt@google.com>
Reficul <xuzhenglun@gmail.com> Reficul <xuzhenglun@gmail.com>
Remy Suen <remy.suen@gmail.com> Remy Suen <remy.suen@gmail.com>
@ -553,6 +558,7 @@ Robin Naundorf <r.naundorf@fh-muenster.de>
Robin Speekenbrink <robin@kingsquare.nl> Robin Speekenbrink <robin@kingsquare.nl>
Rodolfo Ortiz <rodolfo.ortiz@definityfirst.com> Rodolfo Ortiz <rodolfo.ortiz@definityfirst.com>
Rogelio Canedo <rcanedo@mappy.priv> Rogelio Canedo <rcanedo@mappy.priv>
Rohan Verma <hello@rohanverma.net>
Roland Kammerer <roland.kammerer@linbit.com> Roland Kammerer <roland.kammerer@linbit.com>
Roman Dudin <katrmr@gmail.com> Roman Dudin <katrmr@gmail.com>
Rory Hunter <roryhunter2@gmail.com> Rory Hunter <roryhunter2@gmail.com>
@ -701,6 +707,7 @@ Yuan Sun <sunyuan3@huawei.com>
Yue Zhang <zy675793960@yeah.net> Yue Zhang <zy675793960@yeah.net>
Yunxiang Huang <hyxqshk@vip.qq.com> Yunxiang Huang <hyxqshk@vip.qq.com>
Zachary Romero <zacromero3@gmail.com> Zachary Romero <zacromero3@gmail.com>
Zander Mackie <zmackie@gmail.com>
zebrilee <zebrilee@gmail.com> zebrilee <zebrilee@gmail.com>
Zhang Kun <zkazure@gmail.com> Zhang Kun <zkazure@gmail.com>
Zhang Wei <zhangwei555@huawei.com> Zhang Wei <zhangwei555@huawei.com>

2
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 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. by Keith Rarick, licensed under the MIT License.
The following is courtesy of our legal counsel: The following is courtesy of our legal counsel:

6
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}} image: {{.Image}}
command: {{.Command}} command: {{.Command}}
created_at: {{.CreatedAt}} created_at: {{.CreatedAt}}
state: {{- pad .State 1 0}}
status: {{- pad .Status 1 0}} status: {{- pad .Status 1 0}}
names: {{.Names}} names: {{.Names}}
labels: {{- pad .Labels 1 0}} labels: {{- pad .Labels 1 0}}
@ -87,6 +88,7 @@ func newContainerContext() *containerContext {
"CreatedAt": CreatedAtHeader, "CreatedAt": CreatedAtHeader,
"RunningFor": runningForHeader, "RunningFor": runningForHeader,
"Ports": PortsHeader, "Ports": PortsHeader,
"State": StateHeader,
"Status": StatusHeader, "Status": StatusHeader,
"Size": SizeHeader, "Size": SizeHeader,
"Labels": LabelsHeader, "Labels": LabelsHeader,
@ -169,6 +171,10 @@ func (c *containerContext) Ports() string {
return DisplayablePorts(c.c.Ports) return DisplayablePorts(c.c.Ports)
} }
func (c *containerContext) State() string {
return c.c.State
}
func (c *containerContext) Status() string { func (c *containerContext) Status() string {
return c.c.Status return c.c.Status
} }

1
vendor/github.com/docker/cli/cli/command/formatter/custom.go сгенерированный поставляемый
Просмотреть файл

@ -12,6 +12,7 @@ const (
DescriptionHeader = "DESCRIPTION" DescriptionHeader = "DESCRIPTION"
DriverHeader = "DRIVER" DriverHeader = "DRIVER"
ScopeHeader = "SCOPE" ScopeHeader = "SCOPE"
StateHeader = "STATE"
StatusHeader = "STATUS" StatusHeader = "STATUS"
PortsHeader = "PORTS" PortsHeader = "PORTS"
ImageHeader = "IMAGE" ImageHeader = "IMAGE"

5
vendor/github.com/docker/cli/cli/command/stack/swarm/services.go сгенерированный поставляемый
Просмотреть файл

@ -3,6 +3,7 @@ package swarm
import ( import (
"context" "context"
"fmt" "fmt"
"sort"
"github.com/docker/cli/cli/command" "github.com/docker/cli/cli/command"
"github.com/docker/cli/cli/command/service" "github.com/docker/cli/cli/command/service"
@ -10,6 +11,7 @@ import (
"github.com/docker/cli/cli/command/stack/options" "github.com/docker/cli/cli/command/stack/options"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/filters"
"vbom.ml/util/sortorder"
) )
// RunServices is the swarm implementation of docker stack services // RunServices is the swarm implementation of docker stack services
@ -29,6 +31,9 @@ func RunServices(dockerCli command.Cli, opts options.Services) error {
return nil 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{} info := map[string]service.ListInfo{}
if !opts.Quiet { if !opts.Quiet {
taskFilter := filters.NewArgs() taskFilter := filters.NewArgs()

2
vendor/github.com/docker/cli/cli/compose/loader/full-example.yml сгенерированный поставляемый
Просмотреть файл

@ -1,4 +1,4 @@
version: "3.8" version: "3.9"
services: services:
foo: foo:

26
vendor/github.com/docker/cli/cli/compose/loader/loader.go сгенерированный поставляемый
Просмотреть файл

@ -32,6 +32,14 @@ type Options struct {
SkipInterpolation bool SkipInterpolation bool
// Interpolation options // Interpolation options
Interpolate *interp.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 // 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 return nil, err
} }
cfg.Filename = file.Filename cfg.Filename = file.Filename
if opts.discardEnvFiles {
for i := range cfg.Services {
cfg.Services[i].EnvFile = nil
}
}
configs = append(configs, cfg) configs = append(configs, cfg)
} }
@ -479,12 +492,13 @@ func resolveVolumePaths(volumes []types.ServiceVolumeConfig, workingDir string,
} }
filePath := expandUser(volume.Source, lookupEnv) filePath := expandUser(volume.Source, lookupEnv)
// Check for a Unix absolute path first, to handle a Windows client // Check if source is an absolute path (either Unix or Windows), to
// with a Unix daemon. This handles a Windows client connecting to a // handle a Windows client with a Unix daemon or vice-versa.
// Unix daemon. Note that this is not required for Docker for Windows //
// when specifying a local Windows path, because Docker for Windows // Note that this is not required for Docker for Windows when specifying
// translates the Windows path into a valid path within the VM. // a local Windows path, because Docker for Windows translates the Windows
if !path.IsAbs(filePath) { // path into a valid path within the VM.
if !path.IsAbs(filePath) && !isAbs(filePath) {
filePath = absPath(workingDir, filePath) filePath = absPath(workingDir, filePath)
} }
volume.Source = filePath volume.Source = filePath

66
vendor/github.com/docker/cli/cli/compose/loader/windows_path.go сгенерированный поставляемый Normal file
Просмотреть файл

@ -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
}

44
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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
vNT9GICnn3Kc4a+q/59W/w0AAP//CCwovkZHAAA=
`,
},
"/": { "/": {
isDir: true, isDir: true,
local: "", local: "",

4
vendor/github.com/docker/cli/cli/context/docker/load.go сгенерированный поставляемый
Просмотреть файл

@ -104,8 +104,8 @@ func (c *Endpoint) ClientOpts() ([]client.Opt, error) {
return nil, err return nil, err
} }
result = append(result, result = append(result,
client.WithHost(c.Host),
withHTTPClient(tlsConfig), withHTTPClient(tlsConfig),
client.WithHost(c.Host),
) )
} else { } else {
@ -127,6 +127,8 @@ func (c *Endpoint) ClientOpts() ([]client.Opt, error) {
version := os.Getenv("DOCKER_API_VERSION") version := os.Getenv("DOCKER_API_VERSION")
if version != "" { if version != "" {
result = append(result, client.WithVersion(version)) result = append(result, client.WithVersion(version))
} else {
result = append(result, client.WithAPIVersionNegotiation())
} }
return result, nil return result, nil
} }