|
 |
f93050 |
From 4f7d01ec556a450f17eca43b39d3ee34cd362bb8 Mon Sep 17 00:00:00 2001
|
|
|
f93050 |
From: rpm-build <rpm-build>
|
|
|
f93050 |
Date: Wed, 29 Jul 2020 15:16:26 +0200
|
|
|
f93050 |
Subject: [PATCH] bump github.com/containers/buildah to v1.11.5
|
|
|
f93050 |
|
|
|
f93050 |
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1853326
|
|
|
f93050 |
Signed-off-by: Valentin Rothber <rothberg@redhat.com>
|
|
|
f93050 |
---
|
|
|
f93050 |
go.mod | 4 +-
|
|
|
f93050 |
go.sum | 7 ++
|
|
|
f93050 |
.../github.com/containers/buildah/.travis.yml | 34 ++++---
|
|
|
f93050 |
.../github.com/containers/buildah/buildah.go | 11 ++-
|
|
|
f93050 |
.../containers/buildah/changelog.txt | 27 ++++++
|
|
|
f93050 |
.../github.com/containers/buildah/config.go | 5 +-
|
|
|
f93050 |
vendor/github.com/containers/buildah/go.mod | 4 +-
|
|
|
f93050 |
vendor/github.com/containers/buildah/go.sum | 58 ++++++++++++
|
|
|
f93050 |
.../containers/buildah/imagebuildah/build.go | 3 +-
|
|
|
f93050 |
.../buildah/imagebuildah/executor.go | 9 ++
|
|
|
f93050 |
.../buildah/imagebuildah/stage_executor.go | 4 +-
|
|
|
f93050 |
.../containers/buildah/imagebuildah/util.go | 5 +-
|
|
|
f93050 |
.../github.com/containers/buildah/import.go | 44 ++++++---
|
|
|
f93050 |
vendor/github.com/containers/buildah/info.go | 3 +
|
|
|
f93050 |
vendor/github.com/containers/buildah/new.go | 91 ++++++++++++++-----
|
|
|
f93050 |
.../containers/buildah/pkg/cli/common.go | 20 ++--
|
|
|
f93050 |
.../containers/buildah/pkg/secrets/secrets.go | 48 ++--------
|
|
|
f93050 |
.../containers/buildah/run_linux.go | 2 +-
|
|
|
f93050 |
vendor/github.com/docker/docker/AUTHORS | 57 +++++++++++-
|
|
|
f93050 |
.../github.com/docker/docker/api/swagger.yaml | 32 ++++++-
|
|
|
f93050 |
.../docker/docker/api/types/client.go | 4 +
|
|
|
f93050 |
.../docker/docker/api/types/filters/parse.go | 9 ++
|
|
|
f93050 |
.../docker/docker/api/types/swarm/service.go | 21 +++++
|
|
|
f93050 |
.../docker/docker/client/container_list.go | 2 +-
|
|
|
f93050 |
.../github.com/docker/docker/client/events.go | 2 +-
|
|
|
f93050 |
.../github.com/docker/docker/client/hijack.go | 6 +-
|
|
|
f93050 |
.../docker/docker/client/image_list.go | 2 +-
|
|
|
f93050 |
.../docker/docker/client/network_list.go | 2 +-
|
|
|
f93050 |
.../github.com/docker/docker/client/ping.go | 4 +-
|
|
|
f93050 |
.../docker/docker/client/plugin_list.go | 2 +-
|
|
|
f93050 |
.../docker/docker/client/request.go | 14 +--
|
|
|
f93050 |
.../docker/docker/client/service_list.go | 4 +
|
|
|
f93050 |
.../docker/docker/client/volume_list.go | 2 +-
|
|
|
f93050 |
.../docker/docker/pkg/homedir/homedir_unix.go | 7 +-
|
|
|
f93050 |
.../docker/pkg/jsonmessage/jsonmessage.go | 8 +-
|
|
|
f93050 |
.../docker/pkg/mount/mountinfo_linux.go | 1 -
|
|
|
f93050 |
.../pkg/namesgenerator/names-generator.go | 2 +-
|
|
|
f93050 |
.../docker/docker/pkg/pools/pools.go | 11 +--
|
|
|
f93050 |
.../docker/docker/pkg/system/init_windows.go | 3 +-
|
|
|
f93050 |
.../docker/pkg/system/syscall_windows.go | 21 +----
|
|
|
f93050 |
.../fsouza/go-dockerclient/Makefile | 5 -
|
|
|
f93050 |
.../fsouza/go-dockerclient/README.md | 22 +++--
|
|
|
f93050 |
.../fsouza/go-dockerclient/appveyor.yml | 4 +-
|
|
|
f93050 |
.../fsouza/go-dockerclient/container.go | 30 ++++--
|
|
|
f93050 |
.../github.com/fsouza/go-dockerclient/go.mod | 10 +-
|
|
|
f93050 |
.../github.com/fsouza/go-dockerclient/go.sum | 79 +++++++++++++---
|
|
|
f93050 |
vendor/github.com/mtrmac/gpgme/gpgme.go | 2 +-
|
|
|
f93050 |
vendor/k8s.io/client-go/pkg/version/base.go | 4 +-
|
|
|
f93050 |
vendor/modules.txt | 6 +-
|
|
|
f93050 |
49 files changed, 539 insertions(+), 218 deletions(-)
|
|
|
f93050 |
|
|
|
f93050 |
diff --git a/go.mod b/go.mod
|
|
|
f93050 |
index 086d25cc902f..c8a2c298b8aa 100644
|
|
|
f93050 |
--- a/go.mod
|
|
|
f93050 |
+++ b/go.mod
|
|
|
f93050 |
@@ -10,7 +10,7 @@ require (
|
|
|
f93050 |
github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd // indirect
|
|
|
f93050 |
github.com/containernetworking/cni v0.7.1
|
|
|
f93050 |
github.com/containernetworking/plugins v0.8.2
|
|
|
f93050 |
- github.com/containers/buildah v1.11.5-0.20191031204705-20e92ffe0982
|
|
|
f93050 |
+ github.com/containers/buildah v1.11.5
|
|
|
f93050 |
github.com/containers/image/v5 v5.2.1
|
|
|
f93050 |
github.com/containers/psgo v1.3.2
|
|
|
f93050 |
github.com/containers/storage v1.15.8
|
|
|
f93050 |
@@ -20,7 +20,7 @@ require (
|
|
|
f93050 |
github.com/cyphar/filepath-securejoin v0.2.2
|
|
|
f93050 |
github.com/davecgh/go-spew v1.1.1
|
|
|
f93050 |
github.com/docker/distribution v2.7.1+incompatible
|
|
|
f93050 |
- github.com/docker/docker v1.4.2-0.20190927142053-ada3c14355ce
|
|
|
f93050 |
+ github.com/docker/docker v1.4.2-0.20191101170500-ac7306503d23
|
|
|
f93050 |
github.com/docker/docker-credential-helpers v0.6.3
|
|
|
f93050 |
github.com/docker/go-connections v0.4.0
|
|
|
f93050 |
github.com/docker/go-units v0.4.0
|
|
|
f93050 |
diff --git a/go.sum b/go.sum
|
|
|
f93050 |
index 9456b2bfba1a..8e3505c1bb5d 100644
|
|
|
f93050 |
--- a/go.sum
|
|
|
f93050 |
+++ b/go.sum
|
|
|
f93050 |
@@ -19,6 +19,7 @@ github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5 h1:ygIc8M6tr
|
|
|
f93050 |
github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw=
|
|
|
f93050 |
github.com/Microsoft/hcsshim v0.8.6 h1:ZfF0+zZeYdzMIVMZHKtDKJvLHj76XCuVae/jNkjj0IA=
|
|
|
f93050 |
github.com/Microsoft/hcsshim v0.8.6/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg=
|
|
|
f93050 |
+github.com/Microsoft/hcsshim v0.8.7-0.20191101173118-65519b62243c/go.mod h1:7xhjOwRV2+0HXGmM0jxaEu+ZiXJFoVZOTfL/dmqbrD8=
|
|
|
f93050 |
github.com/Microsoft/hcsshim v0.8.7 h1:ptnOoufxGSzauVTsdE+wMYnCWA301PdoN4xg5oRdZpg=
|
|
|
f93050 |
github.com/Microsoft/hcsshim v0.8.7/go.mod h1:OHd7sQqRFrYd3RmSgbgji+ctCwkbq2wbEYNSzOYtcBQ=
|
|
|
f93050 |
github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
|
|
|
f93050 |
@@ -75,6 +76,8 @@ github.com/containers/buildah v1.11.4-0.20191028173731-21b4778b359e h1:iDavHEx5Y
|
|
|
f93050 |
github.com/containers/buildah v1.11.4-0.20191028173731-21b4778b359e/go.mod h1:Igrk75FAxLnzDaHUbtpWB8pwL+Bv+cnakWMvqAXW2v8=
|
|
|
f93050 |
github.com/containers/buildah v1.11.5-0.20191031204705-20e92ffe0982 h1:5WUe09k2sJSbmxwLHZLHc41TrIPrP0GlbhX+WDJBqvs=
|
|
|
f93050 |
github.com/containers/buildah v1.11.5-0.20191031204705-20e92ffe0982/go.mod h1:eGWB4tLoo0hIBuytQpvgUC0hk2mvl2ofaYBeDsU/qoc=
|
|
|
f93050 |
+github.com/containers/buildah v1.11.5 h1:bVpkaVlvA7G+1mBDAcX6yf7jNZJ/ZrrAHDt4WCx2i8E=
|
|
|
f93050 |
+github.com/containers/buildah v1.11.5/go.mod h1:bfNPqLO8GnI0qMPmI6MHSpQNK+a3TH9syYsRg+iqhRw=
|
|
|
f93050 |
github.com/containers/image/v5 v5.0.0 h1:arnXgbt1ucsC/ndtSpiQY87rA0UjhF+/xQnPzqdBDn4=
|
|
|
f93050 |
github.com/containers/image/v5 v5.0.0/go.mod h1:MgiLzCfIeo8lrHi+4Lb8HP+rh513sm0Mlk6RrhjFOLY=
|
|
|
f93050 |
github.com/containers/image/v5 v5.0.1-0.20200205124631-82291c45f2b0 h1:iV4aHKRoPcHp5BISsuiPMyaCjGJfLKp/FUMAG1NeqvE=
|
|
|
f93050 |
@@ -130,6 +133,8 @@ github.com/docker/docker v0.0.0-20171019062838-86f080cff091/go.mod h1:eEKB0N0r5N
|
|
|
f93050 |
github.com/docker/docker v0.0.0-20180522102801-da99009bbb11/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
|
|
|
f93050 |
github.com/docker/docker v1.4.2-0.20190927142053-ada3c14355ce h1:H3csZuxZESJeeEiOxq4YXPNmLFbjl7u2qVBrAAGX/sA=
|
|
|
f93050 |
github.com/docker/docker v1.4.2-0.20190927142053-ada3c14355ce/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
|
|
|
f93050 |
+github.com/docker/docker v1.4.2-0.20191101170500-ac7306503d23 h1:oqgGT9O61YAYvI41EBsLePOr+LE6roB0xY4gpkZuFSE=
|
|
|
f93050 |
+github.com/docker/docker v1.4.2-0.20191101170500-ac7306503d23/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
|
|
|
f93050 |
github.com/docker/docker-credential-helpers v0.6.0/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y=
|
|
|
f93050 |
github.com/docker/docker-credential-helpers v0.6.1 h1:Dq4iIfcM7cNtddhLVWe9h4QDjsi4OER3Z8voPu/I52g=
|
|
|
f93050 |
github.com/docker/docker-credential-helpers v0.6.1/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y=
|
|
|
f93050 |
@@ -165,6 +170,8 @@ github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV
|
|
|
f93050 |
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
|
|
|
f93050 |
github.com/fsouza/go-dockerclient v1.5.0 h1:7OtayOe5HnoG+KWMHgyyPymwaodnB2IDYuVfseKyxbA=
|
|
|
f93050 |
github.com/fsouza/go-dockerclient v1.5.0/go.mod h1:AqZZK/zFO3phxYxlTsAaeAMSdQ9mgHuhy+bjN034Qds=
|
|
|
f93050 |
+github.com/fsouza/go-dockerclient v1.6.0 h1:f7j+AX94143JL1H3TiqSMkM4EcLDI0De1qD4GGn3Hig=
|
|
|
f93050 |
+github.com/fsouza/go-dockerclient v1.6.0/go.mod h1:YWwtNPuL4XTX1SKJQk86cWPmmqwx+4np9qfPbb+znGc=
|
|
|
f93050 |
github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa h1:RDBNVkRviHZtvDvId8XSGPu3rmpmSe+wKRcEWNgsfWU=
|
|
|
f93050 |
github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod h1:KnogPXtdwXqoenmZCw6S+25EAm2MkxbG0deNDu4cbSA=
|
|
|
f93050 |
github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
|
|
|
f93050 |
diff --git a/vendor/github.com/containers/buildah/.travis.yml b/vendor/github.com/containers/buildah/.travis.yml
|
|
|
f93050 |
index a7410823043f..8bf3756f517d 100644
|
|
|
f93050 |
--- a/vendor/github.com/containers/buildah/.travis.yml
|
|
|
f93050 |
+++ b/vendor/github.com/containers/buildah/.travis.yml
|
|
|
f93050 |
@@ -68,21 +68,25 @@ script:
|
|
|
f93050 |
# Fail fast
|
|
|
f93050 |
- set -e
|
|
|
f93050 |
# Let's do some docker stuff just for verification purposes
|
|
|
f93050 |
- - docker ps --all
|
|
|
f93050 |
- - docker images
|
|
|
f93050 |
- - ls -alF /home/travis/auth
|
|
|
f93050 |
- - docker pull docker.io/alpine
|
|
|
f93050 |
- - echo testpassword | docker login localhost:5000 --username testuser --password-stdin
|
|
|
f93050 |
- - docker tag alpine localhost:5000/my-alpine
|
|
|
f93050 |
- - docker push localhost:5000/my-alpine
|
|
|
f93050 |
- - docker ps --all
|
|
|
f93050 |
- - docker images
|
|
|
f93050 |
- - docker rmi docker.io/alpine
|
|
|
f93050 |
- - docker rmi localhost:5000/my-alpine
|
|
|
f93050 |
- - docker pull localhost:5000/my-alpine
|
|
|
f93050 |
- - docker ps --all
|
|
|
f93050 |
- - docker images
|
|
|
f93050 |
- - docker rmi localhost:5000/my-alpine
|
|
|
f93050 |
+# Commented out the following in order to get travis runs
|
|
|
f93050 |
+# under the 50 minute requirement. Do not remove as we may
|
|
|
f93050 |
+# want to use this in cirrius testing when we move there.
|
|
|
f93050 |
+# - docker ps --all
|
|
|
f93050 |
+# - docker images
|
|
|
f93050 |
+# - ls -alF /home/travis/auth
|
|
|
f93050 |
+# - docker pull docker.io/alpine
|
|
|
f93050 |
+# - echo testpassword | docker login localhost:5000 --username testuser --password-stdin
|
|
|
f93050 |
+# - docker tag alpine localhost:5000/my-alpine
|
|
|
f93050 |
+# - docker push localhost:5000/my-alpine
|
|
|
f93050 |
+# - docker ps --all
|
|
|
f93050 |
+# - docker images
|
|
|
f93050 |
+# - docker rmi docker.io/alpine
|
|
|
f93050 |
+# - docker rmi localhost:5000/my-alpine
|
|
|
f93050 |
+# - docker pull localhost:5000/my-alpine
|
|
|
f93050 |
+# - docker ps --all
|
|
|
f93050 |
+# - docker images
|
|
|
f93050 |
+# - docker rmi localhost:5000/my-alpine
|
|
|
f93050 |
+# End Speed up comment
|
|
|
f93050 |
# Setting up Docker Registry is complete, let's do Buildah testing!
|
|
|
f93050 |
- make install.tools -j4
|
|
|
f93050 |
- make install.libseccomp.sudo all runc validate lint SECURITYTAGS="apparmor seccomp"
|
|
|
f93050 |
diff --git a/vendor/github.com/containers/buildah/buildah.go b/vendor/github.com/containers/buildah/buildah.go
|
|
|
f93050 |
index d57eea818e37..7042590d1432 100644
|
|
|
f93050 |
--- a/vendor/github.com/containers/buildah/buildah.go
|
|
|
f93050 |
+++ b/vendor/github.com/containers/buildah/buildah.go
|
|
|
f93050 |
@@ -27,7 +27,7 @@ const (
|
|
|
f93050 |
Package = "buildah"
|
|
|
f93050 |
// Version for the Package. Bump version in contrib/rpm/buildah.spec
|
|
|
f93050 |
// too.
|
|
|
f93050 |
- Version = "1.12.0-dev"
|
|
|
f93050 |
+ Version = "1.11.5"
|
|
|
f93050 |
// The value we use to identify what type of information, currently a
|
|
|
f93050 |
// serialized Builder structure, we are using as per-container state.
|
|
|
f93050 |
// This should only be changed when we make incompatible changes to
|
|
|
f93050 |
@@ -40,7 +40,7 @@ const (
|
|
|
f93050 |
stateFile = Package + ".json"
|
|
|
f93050 |
)
|
|
|
f93050 |
|
|
|
f93050 |
-// PullPolicy takes the value PullIfMissing, PullAlways, or PullNever.
|
|
|
f93050 |
+// PullPolicy takes the value PullIfMissing, PullAlways, PullIfNewer, or PullNever.
|
|
|
f93050 |
type PullPolicy int
|
|
|
f93050 |
|
|
|
f93050 |
const (
|
|
|
f93050 |
@@ -52,6 +52,11 @@ const (
|
|
|
f93050 |
// take, signalling that a fresh, possibly updated, copy of the image
|
|
|
f93050 |
// should be pulled from a registry before the build proceeds.
|
|
|
f93050 |
PullAlways
|
|
|
f93050 |
+ // PullIfNewer is one of the values that BuilderOptions.PullPolicy
|
|
|
f93050 |
+ // can take, signalling that the source image should only be pulled
|
|
|
f93050 |
+ // from a registry if a local copy is not already present or if a
|
|
|
f93050 |
+ // newer version the image is present on the repository.
|
|
|
f93050 |
+ PullIfNewer
|
|
|
f93050 |
// PullNever is one of the values that BuilderOptions.PullPolicy can
|
|
|
f93050 |
// take, signalling that the source image should not be pulled from a
|
|
|
f93050 |
// registry if a local copy of it is not already present.
|
|
|
f93050 |
@@ -65,6 +70,8 @@ func (p PullPolicy) String() string {
|
|
|
f93050 |
return "PullIfMissing"
|
|
|
f93050 |
case PullAlways:
|
|
|
f93050 |
return "PullAlways"
|
|
|
f93050 |
+ case PullIfNewer:
|
|
|
f93050 |
+ return "PullIfNewer"
|
|
|
f93050 |
case PullNever:
|
|
|
f93050 |
return "PullNever"
|
|
|
f93050 |
}
|
|
|
f93050 |
diff --git a/vendor/github.com/containers/buildah/changelog.txt b/vendor/github.com/containers/buildah/changelog.txt
|
|
|
f93050 |
index 6e98e54050dc..098e6d6d4f75 100644
|
|
|
f93050 |
--- a/vendor/github.com/containers/buildah/changelog.txt
|
|
|
f93050 |
+++ b/vendor/github.com/containers/buildah/changelog.txt
|
|
|
f93050 |
@@ -1,3 +1,30 @@
|
|
|
f93050 |
+- Changelog for v1.11.5 (2019-11-11)
|
|
|
f93050 |
+ * Enhance error on unsafe symbolic link targets
|
|
|
f93050 |
+ * Add OCIRuntime to info
|
|
|
f93050 |
+ * Check nonexsit authfile
|
|
|
f93050 |
+ * Only output image id if running buildah bud --quiet
|
|
|
f93050 |
+ * Fix --pull=true||false and add --pull-never to bud and from (retry)
|
|
|
f93050 |
+ * cgroups v2: tweak or skip tests
|
|
|
f93050 |
+ * Prepwork: new 'skip' helpers for tests
|
|
|
f93050 |
+ * Handle configuration blobs for manifest lists
|
|
|
f93050 |
+ * unmarshalConvertedConfig: avoid using the updated image's ref
|
|
|
f93050 |
+ * Add completions for Manifest commands
|
|
|
f93050 |
+ * Add disableFips option to secrets pkg
|
|
|
f93050 |
+ * Update bud.bats test archive test
|
|
|
f93050 |
+ * Add test for caching based on content digest
|
|
|
f93050 |
+ * Builder.untarPath(): always evaluate b.ContentDigester.Hash()
|
|
|
f93050 |
+ * Bump github.com/onsi/ginkgo from 1.10.1 to 1.10.2
|
|
|
f93050 |
+ * Fix another broken test: copy-url-mtime
|
|
|
f93050 |
+ * yet more fixes
|
|
|
f93050 |
+ * Actual bug fix for 'add' test: fix the expected mode
|
|
|
f93050 |
+ * BATS tests - lots of mostly minor cleanup
|
|
|
f93050 |
+ * build: drop support for ostree
|
|
|
f93050 |
+ * Add support for make vendor-in-container
|
|
|
f93050 |
+ * imgtype: exit with error if storage fails
|
|
|
f93050 |
+ * remove XDG_RUNTIME_DIR from default authfile path
|
|
|
f93050 |
+ * fix troubleshooting redirect instructions
|
|
|
f93050 |
+ * Bump back to v1.12.0-dev
|
|
|
f93050 |
+
|
|
|
f93050 |
- Changelog for v1.11.4 (2019-10-28)
|
|
|
f93050 |
* buildah: add a "manifest" command
|
|
|
f93050 |
* manifests: add the module
|
|
|
f93050 |
diff --git a/vendor/github.com/containers/buildah/config.go b/vendor/github.com/containers/buildah/config.go
|
|
|
f93050 |
index 617619e45c14..32f2171eb036 100644
|
|
|
f93050 |
--- a/vendor/github.com/containers/buildah/config.go
|
|
|
f93050 |
+++ b/vendor/github.com/containers/buildah/config.go
|
|
|
f93050 |
@@ -26,7 +26,7 @@ func unmarshalConvertedConfig(ctx context.Context, dest interface{}, img types.I
|
|
|
f93050 |
return errors.Wrapf(err, "error getting manifest MIME type for %q", transports.ImageName(img.Reference()))
|
|
|
f93050 |
}
|
|
|
f93050 |
if wantedManifestMIMEType != actualManifestMIMEType {
|
|
|
f93050 |
- img, err = img.UpdatedImage(ctx, types.ManifestUpdateOptions{
|
|
|
f93050 |
+ updatedImg, err := img.UpdatedImage(ctx, types.ManifestUpdateOptions{
|
|
|
f93050 |
ManifestMIMEType: wantedManifestMIMEType,
|
|
|
f93050 |
InformationOnly: types.ManifestUpdateInformation{ // Strictly speaking, every value in here is invalid. But…
|
|
|
f93050 |
Destination: nil, // Destination is technically required, but actually necessary only for conversion _to_ v2s1. Leave it nil, we will crash if that ever changes.
|
|
|
f93050 |
@@ -35,8 +35,9 @@ func unmarshalConvertedConfig(ctx context.Context, dest interface{}, img types.I
|
|
|
f93050 |
},
|
|
|
f93050 |
})
|
|
|
f93050 |
if err != nil {
|
|
|
f93050 |
- return errors.Wrapf(err, "error converting image %q to %s", transports.ImageName(img.Reference()), wantedManifestMIMEType)
|
|
|
f93050 |
+ return errors.Wrapf(err, "error converting image %q from %q to %q", transports.ImageName(img.Reference()), actualManifestMIMEType, wantedManifestMIMEType)
|
|
|
f93050 |
}
|
|
|
f93050 |
+ img = updatedImg
|
|
|
f93050 |
}
|
|
|
f93050 |
config, err := img.ConfigBlob(ctx)
|
|
|
f93050 |
if err != nil {
|
|
|
f93050 |
diff --git a/vendor/github.com/containers/buildah/go.mod b/vendor/github.com/containers/buildah/go.mod
|
|
|
f93050 |
index c8741b7812d9..2c76c46bffeb 100644
|
|
|
f93050 |
--- a/vendor/github.com/containers/buildah/go.mod
|
|
|
f93050 |
+++ b/vendor/github.com/containers/buildah/go.mod
|
|
|
f93050 |
@@ -14,7 +14,7 @@ require (
|
|
|
f93050 |
github.com/docker/go-units v0.4.0
|
|
|
f93050 |
github.com/docker/libnetwork v0.8.0-dev.2.0.20190625141545-5a177b73e316
|
|
|
f93050 |
github.com/etcd-io/bbolt v1.3.3
|
|
|
f93050 |
- github.com/fsouza/go-dockerclient v1.5.0
|
|
|
f93050 |
+ github.com/fsouza/go-dockerclient v1.6.0
|
|
|
f93050 |
github.com/ghodss/yaml v1.0.0
|
|
|
f93050 |
github.com/hashicorp/go-multierror v1.0.0
|
|
|
f93050 |
github.com/imdario/mergo v0.3.6 // indirect
|
|
|
f93050 |
@@ -43,7 +43,7 @@ require (
|
|
|
f93050 |
github.com/vishvananda/netns v0.0.0-20190625233234-7109fa855b0f // indirect
|
|
|
f93050 |
github.com/xeipuuv/gojsonschema v1.1.0 // indirect
|
|
|
f93050 |
golang.org/x/crypto v0.0.0-20190927123631-a832865fa7ad
|
|
|
f93050 |
- golang.org/x/sys v0.0.0-20190902133755-9109b7679e13
|
|
|
f93050 |
+ golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3
|
|
|
f93050 |
golang.org/x/time v0.0.0-20190921001708-c4c64cad1fd0 // indirect
|
|
|
f93050 |
google.golang.org/grpc v1.24.0 // indirect
|
|
|
f93050 |
k8s.io/api v0.0.0-20190813020757-36bff7324fb7 // indirect
|
|
|
f93050 |
diff --git a/vendor/github.com/containers/buildah/go.sum b/vendor/github.com/containers/buildah/go.sum
|
|
|
f93050 |
index 4a6673b04808..15dab479487e 100644
|
|
|
f93050 |
--- a/vendor/github.com/containers/buildah/go.sum
|
|
|
f93050 |
+++ b/vendor/github.com/containers/buildah/go.sum
|
|
|
f93050 |
@@ -11,8 +11,12 @@ github.com/Microsoft/go-winio v0.4.12 h1:xAfWHN1IrQ0NJ9TBC0KBZoqLjzDTr1ML+4MywiU
|
|
|
f93050 |
github.com/Microsoft/go-winio v0.4.12/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
|
|
|
f93050 |
github.com/Microsoft/go-winio v0.4.14 h1:+hMXMk01us9KgxGb7ftKQt2Xpf5hH/yky+TDA+qxleU=
|
|
|
f93050 |
github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
|
|
|
f93050 |
+github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5 h1:ygIc8M6trr62pF5DucadTWGdEB4mEyvzi0e2nbcmcyA=
|
|
|
f93050 |
+github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw=
|
|
|
f93050 |
github.com/Microsoft/hcsshim v0.8.6 h1:ZfF0+zZeYdzMIVMZHKtDKJvLHj76XCuVae/jNkjj0IA=
|
|
|
f93050 |
github.com/Microsoft/hcsshim v0.8.6/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg=
|
|
|
f93050 |
+github.com/Microsoft/hcsshim v0.8.7-0.20191101173118-65519b62243c h1:YMP6olTU903X3gxQJckdmiP8/zkSMq4kN3uipsU9XjU=
|
|
|
f93050 |
+github.com/Microsoft/hcsshim v0.8.7-0.20191101173118-65519b62243c/go.mod h1:7xhjOwRV2+0HXGmM0jxaEu+ZiXJFoVZOTfL/dmqbrD8=
|
|
|
f93050 |
github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
|
|
|
f93050 |
github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
|
|
|
f93050 |
github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
|
|
|
f93050 |
@@ -25,14 +29,25 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24
|
|
|
f93050 |
github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
|
|
|
f93050 |
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
|
|
|
f93050 |
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
|
|
|
f93050 |
+github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
|
|
|
f93050 |
github.com/blang/semver v3.5.0+incompatible h1:CGxCgetQ64DKk7rdZ++Vfnb1+ogGNnB17OJKJXD2Cfs=
|
|
|
f93050 |
github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
|
|
|
f93050 |
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
|
|
|
f93050 |
+github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f h1:tSNMc+rJDfmYntojat8lljbt1mgKNpTxUZJsSzJ9Y1s=
|
|
|
f93050 |
+github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod h1:OApqhQ4XNSNC13gXIwDjhOQxjWa/NxkwZXJ1EvqT0ko=
|
|
|
f93050 |
+github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw=
|
|
|
f93050 |
+github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
|
|
|
f93050 |
github.com/containerd/containerd v1.3.0 h1:xjvXQWABwS2uiv3TWgQt5Uth60Gu86LTGZXMJkjc7rY=
|
|
|
f93050 |
github.com/containerd/containerd v1.3.0/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
|
|
|
f93050 |
github.com/containerd/continuity v0.0.0-20180216233310-d8fb8589b0e8/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
|
|
|
f93050 |
github.com/containerd/continuity v0.0.0-20181203112020-004b46473808 h1:4BX8f882bXEDKfWIf0wa8HRvpnBoPszJJXL+TVbBw4M=
|
|
|
f93050 |
github.com/containerd/continuity v0.0.0-20181203112020-004b46473808/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
|
|
|
f93050 |
+github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc h1:TP+534wVlf61smEIq1nwLLAjQVEK2EADoW3CX9AuT+8=
|
|
|
f93050 |
+github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
|
|
|
f93050 |
+github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI=
|
|
|
f93050 |
+github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod h1:IV7qH3hrUgRmyYrtgEeGWJfWbgcHL9CSRruz2Vqcph0=
|
|
|
f93050 |
+github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o=
|
|
|
f93050 |
+github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc=
|
|
|
f93050 |
github.com/containernetworking/cni v0.7.1 h1:fE3r16wpSEyaqY4Z4oFrLMmIGfBYIKpPrHK31EJ9FzE=
|
|
|
f93050 |
github.com/containernetworking/cni v0.7.1/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY=
|
|
|
f93050 |
github.com/containers/image/v4 v4.0.1 h1:idNGHChj0Pyv3vLrxul2oSVMZLeFqpoq3CjLeVgapSQ=
|
|
|
f93050 |
@@ -48,6 +63,7 @@ github.com/containers/storage v1.13.5/go.mod h1:HELz8Sn+UVbPaUZMI8RvIG9doD4y4z6G
|
|
|
f93050 |
github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
|
|
|
f93050 |
github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
|
|
|
f93050 |
github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
|
|
|
f93050 |
+github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
|
|
|
f93050 |
github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
|
|
|
f93050 |
github.com/cyphar/filepath-securejoin v0.2.2 h1:jCwT2GTP+PY5nBz3c/YL5PAIbusElVrPujOBSCj8xRg=
|
|
|
f93050 |
github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4=
|
|
|
f93050 |
@@ -64,6 +80,8 @@ github.com/docker/docker v1.4.2-0.20190710153559-aa8249ae1b8b h1:+Ga+YpCDpcY1fln
|
|
|
f93050 |
github.com/docker/docker v1.4.2-0.20190710153559-aa8249ae1b8b/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
|
|
|
f93050 |
github.com/docker/docker v1.4.2-0.20190927142053-ada3c14355ce h1:H3csZuxZESJeeEiOxq4YXPNmLFbjl7u2qVBrAAGX/sA=
|
|
|
f93050 |
github.com/docker/docker v1.4.2-0.20190927142053-ada3c14355ce/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
|
|
|
f93050 |
+github.com/docker/docker v1.4.2-0.20191101170500-ac7306503d23 h1:oqgGT9O61YAYvI41EBsLePOr+LE6roB0xY4gpkZuFSE=
|
|
|
f93050 |
+github.com/docker/docker v1.4.2-0.20191101170500-ac7306503d23/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
|
|
|
f93050 |
github.com/docker/docker-credential-helpers v0.6.0/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y=
|
|
|
f93050 |
github.com/docker/docker-credential-helpers v0.6.1 h1:Dq4iIfcM7cNtddhLVWe9h4QDjsi4OER3Z8voPu/I52g=
|
|
|
f93050 |
github.com/docker/docker-credential-helpers v0.6.1/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y=
|
|
|
f93050 |
@@ -90,6 +108,8 @@ github.com/fsouza/go-dockerclient v1.4.4 h1:Sd5nD4wdAgiPxvrbYUzT2ZZNmPk3z+GGnZ+f
|
|
|
f93050 |
github.com/fsouza/go-dockerclient v1.4.4/go.mod h1:PrwszSL5fbmsESocROrOGq/NULMXRw+bajY0ltzD6MA=
|
|
|
f93050 |
github.com/fsouza/go-dockerclient v1.5.0 h1:7OtayOe5HnoG+KWMHgyyPymwaodnB2IDYuVfseKyxbA=
|
|
|
f93050 |
github.com/fsouza/go-dockerclient v1.5.0/go.mod h1:AqZZK/zFO3phxYxlTsAaeAMSdQ9mgHuhy+bjN034Qds=
|
|
|
f93050 |
+github.com/fsouza/go-dockerclient v1.6.0 h1:f7j+AX94143JL1H3TiqSMkM4EcLDI0De1qD4GGn3Hig=
|
|
|
f93050 |
+github.com/fsouza/go-dockerclient v1.6.0/go.mod h1:YWwtNPuL4XTX1SKJQk86cWPmmqwx+4np9qfPbb+znGc=
|
|
|
f93050 |
github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
|
|
|
f93050 |
github.com/ghodss/yaml v0.0.0-20161207003320-04f313413ffd/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
|
|
|
f93050 |
github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
|
|
|
f93050 |
@@ -102,6 +122,7 @@ github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1
|
|
|
f93050 |
github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc=
|
|
|
f93050 |
github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I=
|
|
|
f93050 |
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
|
|
|
f93050 |
+github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4=
|
|
|
f93050 |
github.com/gogo/protobuf v0.0.0-20170815085658-fcdc5011193f/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
|
|
|
f93050 |
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
|
|
|
f93050 |
github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
|
|
|
f93050 |
@@ -133,11 +154,15 @@ github.com/gorilla/mux v0.0.0-20170217192616-94e7d24fd285/go.mod h1:1lud6UwP+6or
|
|
|
f93050 |
github.com/gorilla/mux v1.7.3 h1:gnP5JzjVOuiZD07fKKToCAOjS0yOpj/qPETTXCCS6hw=
|
|
|
f93050 |
github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
|
|
|
f93050 |
github.com/gotestyourself/gotestyourself v2.2.0+incompatible/go.mod h1:zZKM6oeNM8k+FRljX1mnzVYeS8wiGgQyvST1/GafPbY=
|
|
|
f93050 |
+github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
|
|
|
f93050 |
github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=
|
|
|
f93050 |
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
|
|
|
f93050 |
+github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I=
|
|
|
f93050 |
github.com/hashicorp/go-multierror v1.0.0 h1:iVjPR7a6H0tWELX5NxNe7bYopibicUzc7uPribsnS6o=
|
|
|
f93050 |
github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
|
|
|
f93050 |
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
|
|
|
f93050 |
+github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU=
|
|
|
f93050 |
+github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
|
|
|
f93050 |
github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
|
|
|
f93050 |
github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
|
|
|
f93050 |
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
|
|
|
f93050 |
@@ -219,19 +244,23 @@ github.com/onsi/gomega v1.5.0 h1:izbySO9zDPmjJ8rDjLvkA2zJHIo+HkYXHnf7eN7SSyo=
|
|
|
f93050 |
github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
|
|
|
f93050 |
github.com/onsi/gomega v1.7.0 h1:XPnZz8VVBHjVsy1vzJmRwIcSwiUO+JFfrv/xGiigmME=
|
|
|
f93050 |
github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
|
|
|
f93050 |
+github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
|
|
|
f93050 |
github.com/opencontainers/go-digest v1.0.0-rc1 h1:WzifXhOVOEOuFYOJAW6aQqW0TooG2iki3E3Ii+WN7gQ=
|
|
|
f93050 |
github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
|
|
|
f93050 |
github.com/opencontainers/image-spec v1.0.1 h1:JMemWkRwHx4Zj+fVxWoMCFm/8sYGGrUVojFA6h/TRcI=
|
|
|
f93050 |
github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
|
|
|
f93050 |
github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6 h1:yN8BPXVwMBAm3Cuvh1L5XE8XpvYRMdsVLd82ILprhUU=
|
|
|
f93050 |
github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
|
|
|
f93050 |
+github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
|
|
|
f93050 |
github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
|
|
|
f93050 |
github.com/opencontainers/runc v1.0.0-rc8 h1:dDCFes8Hj1r/i5qnypONo5jdOme/8HWZC/aNDyhECt0=
|
|
|
f93050 |
github.com/opencontainers/runc v1.0.0-rc8/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
|
|
|
f93050 |
github.com/opencontainers/runc v1.0.0-rc8.0.20190827142921-dd075602f158 h1:/A6bAdnSZoTQmKml3MdHAnSEPnBAQeigNBl4sxnfaaQ=
|
|
|
f93050 |
github.com/opencontainers/runc v1.0.0-rc8.0.20190827142921-dd075602f158/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
|
|
|
f93050 |
+github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
|
|
|
f93050 |
github.com/opencontainers/runtime-spec v0.1.2-0.20190618234442-a950415649c7 h1:Dliu5QO+4JYWu/yMshaMU7G3JN2POGpwjJN7gjy10Go=
|
|
|
f93050 |
github.com/opencontainers/runtime-spec v0.1.2-0.20190618234442-a950415649c7/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
|
|
|
f93050 |
+github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod h1:r3f7wjNzSs2extwzU3Y+6pKfobzPh+kKFJ3ofN+3nfs=
|
|
|
f93050 |
github.com/opencontainers/runtime-tools v0.9.0 h1:FYgwVsKRI/H9hU32MJ/4MLOzXWodKK5zsQavY8NPMkU=
|
|
|
f93050 |
github.com/opencontainers/runtime-tools v0.9.0/go.mod h1:r3f7wjNzSs2extwzU3Y+6pKfobzPh+kKFJ3ofN+3nfs=
|
|
|
f93050 |
github.com/opencontainers/selinux v1.2.2 h1:Kx9J6eDG5/24A6DtUquGSpJQ+m2MUTahn4FtGEe8bFg=
|
|
|
f93050 |
@@ -271,6 +300,8 @@ github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R
|
|
|
f93050 |
github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
|
|
|
f93050 |
github.com/prometheus/procfs v0.0.3 h1:CTwfnzjQ+8dS6MhHHu4YswVAD99sL2wjPqP+VkURmKE=
|
|
|
f93050 |
github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
|
|
|
f93050 |
+github.com/prometheus/procfs v0.0.5 h1:3+auTFlqw+ZaQYJARz6ArODtkaIwtvBTx3N2NehQlL8=
|
|
|
f93050 |
+github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
|
|
|
f93050 |
github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
|
|
|
f93050 |
github.com/seccomp/containers-golang v0.0.0-20180629143253-cdfdaa7543f4 h1:rOG9oHVIndNR14f3HRyBy9UPQYmIPniWqTU1TDdHhq4=
|
|
|
f93050 |
github.com/seccomp/containers-golang v0.0.0-20180629143253-cdfdaa7543f4/go.mod h1:f/98/SnvAzhAEFQJ3u836FePXvcbE8BS0YGMQNn4mhA=
|
|
|
f93050 |
@@ -300,6 +331,7 @@ github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0
|
|
|
f93050 |
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
|
|
|
f93050 |
github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
|
|
|
f93050 |
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
|
|
|
f93050 |
+github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
|
|
|
f93050 |
github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2 h1:b6uOv7YOFK0TYG7HtkIgExQo+2RdLuwRft63jn2HWj8=
|
|
|
f93050 |
github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
|
|
|
f93050 |
github.com/tchap/go-patricia v2.3.0+incompatible h1:GkY4dP3cEfEASBPPkWd+AmjYxhmDkqO9/zg7R0lSQRs=
|
|
|
f93050 |
@@ -307,6 +339,7 @@ github.com/tchap/go-patricia v2.3.0+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ
|
|
|
f93050 |
github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
|
|
|
f93050 |
github.com/ulikunitz/xz v0.5.6 h1:jGHAfXawEGZQ3blwU5wnWKQJvAraT7Ftq9EXjnXYgt8=
|
|
|
f93050 |
github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8=
|
|
|
f93050 |
+github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
|
|
|
f93050 |
github.com/vbatts/tar-split v0.11.1 h1:0Odu65rhcZ3JZaPHxl7tCI3V/C/Q9Zf82UFravl02dE=
|
|
|
f93050 |
github.com/vbatts/tar-split v0.11.1/go.mod h1:LEuURwDEiWjRjwu46yU3KVGuUdVv/dcnpcEPSzR8z6g=
|
|
|
f93050 |
github.com/vbauerster/mpb v3.4.0+incompatible h1:mfiiYw87ARaeRW6x5gWwYRUawxaW1tLAD8IceomUCNw=
|
|
|
f93050 |
@@ -321,12 +354,15 @@ github.com/xeipuuv/gojsonpointer v0.0.0-20190809123943-df4f5c81cb3b h1:6cLsL+2FW
|
|
|
f93050 |
github.com/xeipuuv/gojsonpointer v0.0.0-20190809123943-df4f5c81cb3b/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
|
|
|
f93050 |
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0=
|
|
|
f93050 |
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
|
|
|
f93050 |
+github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs=
|
|
|
f93050 |
github.com/xeipuuv/gojsonschema v0.0.0-20190816131739-be0936907f66/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
|
|
|
f93050 |
github.com/xeipuuv/gojsonschema v1.1.0 h1:ngVtJC9TY/lg0AA/1k48FYhBrhRoFlEmWzsehpNAaZg=
|
|
|
f93050 |
github.com/xeipuuv/gojsonschema v1.1.0/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs=
|
|
|
f93050 |
github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
|
|
|
f93050 |
go.etcd.io/bbolt v1.3.3 h1:MUGmc65QhB3pIlaQ5bB4LwqSj6GIonVJXpZiaKNyaKk=
|
|
|
f93050 |
go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
|
|
|
f93050 |
+go.opencensus.io v0.22.0 h1:C9hSCOW830chIVkdja34wa6Ky+IzWllkUinR+BtRZd4=
|
|
|
f93050 |
+go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
|
|
|
f93050 |
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
|
|
|
f93050 |
golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
|
|
|
f93050 |
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M=
|
|
|
f93050 |
@@ -335,12 +371,19 @@ golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 h1:HuIa8hRrWRSrqYzx1qI49N
|
|
|
f93050 |
golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
|
|
f93050 |
golang.org/x/crypto v0.0.0-20190927123631-a832865fa7ad h1:5E5raQxcv+6CZ11RrBYQe5WRbUIWpScjh0kvHZkZIrQ=
|
|
|
f93050 |
golang.org/x/crypto v0.0.0-20190927123631-a832865fa7ad/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
|
|
f93050 |
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
|
|
f93050 |
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
|
|
|
f93050 |
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
|
|
|
f93050 |
golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
|
|
|
f93050 |
golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
|
|
f93050 |
+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
|
|
f93050 |
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
|
|
f93050 |
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
|
|
f93050 |
golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
|
|
f93050 |
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
|
|
f93050 |
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
|
|
f93050 |
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
|
|
f93050 |
+golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
|
|
f93050 |
golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
|
|
f93050 |
golang.org/x/net v0.0.0-20190628185345-da137c7871d7 h1:rTIdg5QFRR7XCaK4LCjBiPbx8j4DQRpdYMnGn/bJUEU=
|
|
|
f93050 |
golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
|
|
f93050 |
@@ -349,9 +392,11 @@ golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJ
|
|
|
f93050 |
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
|
|
f93050 |
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 h1:YUO/7uOKsKeq9UokNS62b8FYywz3ker1l1vDZRCRefw=
|
|
|
f93050 |
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
|
|
f93050 |
+golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
|
|
f93050 |
golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
|
|
|
f93050 |
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
|
|
f93050 |
golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
|
|
f93050 |
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
|
|
f93050 |
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
|
|
f93050 |
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
|
|
f93050 |
golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
|
|
f93050 |
@@ -360,7 +405,9 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h
|
|
|
f93050 |
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
|
f93050 |
golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc=
|
|
|
f93050 |
golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
|
f93050 |
+golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
|
f93050 |
golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
|
f93050 |
+golang.org/x/sys v0.0.0-20190514135907-3a4b5fb9f71f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
|
f93050 |
golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
|
f93050 |
golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb h1:fgwFCsaw9buMuxNd6+DQfAuSFqbNiQZpcgJQAgJsK6k=
|
|
|
f93050 |
golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
|
f93050 |
@@ -370,6 +417,8 @@ golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3 h1:4y9KwBHBgBNwDbtu44R5o1fdO
|
|
|
f93050 |
golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
|
f93050 |
golang.org/x/sys v0.0.0-20190902133755-9109b7679e13 h1:tdsQdquKbTNMsSZLqnLELJGzCANp9oXhu6zFBW6ODx4=
|
|
|
f93050 |
golang.org/x/sys v0.0.0-20190902133755-9109b7679e13/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
|
f93050 |
+golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3 h1:7TYNF4UdlohbFwpNH04CoPMp1cHUZgO1Ebq5r2hIjfo=
|
|
|
f93050 |
+golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
|
f93050 |
golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
|
|
f93050 |
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
|
|
|
f93050 |
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
|
|
f93050 |
@@ -382,12 +431,19 @@ golang.org/x/tools v0.0.0-20180810170437-e96c4e24768d/go.mod h1:n7NCudcB/nEzxVGm
|
|
|
f93050 |
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
|
|
f93050 |
golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
|
|
f93050 |
golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
|
|
f93050 |
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
|
|
f93050 |
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
|
|
|
f93050 |
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
|
|
|
f93050 |
golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
|
|
|
f93050 |
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
|
|
|
f93050 |
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
|
|
|
f93050 |
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
|
|
|
f93050 |
google.golang.org/genproto v0.0.0-20180831171423-11092d34479b h1:lohp5blsw53GBXtLyLNaTXPXS9pJ1tiTw61ZHUoE9Qw=
|
|
|
f93050 |
google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
|
|
|
f93050 |
+google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb h1:i1Ppqkc3WQXikh8bXiwHqAN5Rv3/qDCcRk0/Otx73BY=
|
|
|
f93050 |
+google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
|
|
|
f93050 |
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
|
|
|
f93050 |
+google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
|
|
|
f93050 |
google.golang.org/grpc v1.22.0 h1:J0UbZOIrCAl+fpTOf8YLs4dJo8L/owV4LYVtAXQoPkw=
|
|
|
f93050 |
google.golang.org/grpc v1.22.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
|
|
|
f93050 |
google.golang.org/grpc v1.24.0 h1:vb/1TCsVn3DcJlQ0Gs1yB1pKI6Do2/QNwxdKqmc/b0s=
|
|
|
f93050 |
@@ -410,6 +466,7 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
|
|
f93050 |
gotest.tools v0.0.0-20190624233834-05ebafbffc79/go.mod h1:R//lfYlUuTOTfblYI3lGoAAAebUdzjvbmQsuB7Ykd90=
|
|
|
f93050 |
gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
|
|
|
f93050 |
gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
|
|
|
f93050 |
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
|
|
f93050 |
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
|
|
f93050 |
k8s.io/api v0.0.0-20190813020757-36bff7324fb7 h1:4uJOjRn9kWq4AqJRE8+qzmAy+lJd9rh8TY455dNef4U=
|
|
|
f93050 |
k8s.io/api v0.0.0-20190813020757-36bff7324fb7/go.mod h1:3Iy+myeAORNCLgjd/Xu9ebwN7Vh59Bw0vh9jhoX+V58=
|
|
|
f93050 |
@@ -423,6 +480,7 @@ k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUc
|
|
|
f93050 |
k8s.io/klog v0.3.1 h1:RVgyDHY/kFKtLqh67NvEWIgkMneNoIrdkN0CxDSQc68=
|
|
|
f93050 |
k8s.io/klog v0.3.1/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
|
|
|
f93050 |
k8s.io/kube-openapi v0.0.0-20190709113604-33be087ad058/go.mod h1:nfDlWeOsu3pUf4yWGL+ERqohP4YsZcBJXWMK+gkzOA4=
|
|
|
f93050 |
+k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk=
|
|
|
f93050 |
sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=
|
|
|
f93050 |
sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs=
|
|
|
f93050 |
sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
|
|
|
f93050 |
diff --git a/vendor/github.com/containers/buildah/imagebuildah/build.go b/vendor/github.com/containers/buildah/imagebuildah/build.go
|
|
|
f93050 |
index 6b2c9c84c2ce..fb9600b1a369 100644
|
|
|
f93050 |
--- a/vendor/github.com/containers/buildah/imagebuildah/build.go
|
|
|
f93050 |
+++ b/vendor/github.com/containers/buildah/imagebuildah/build.go
|
|
|
f93050 |
@@ -27,6 +27,7 @@ import (
|
|
|
f93050 |
const (
|
|
|
f93050 |
PullIfMissing = buildah.PullIfMissing
|
|
|
f93050 |
PullAlways = buildah.PullAlways
|
|
|
f93050 |
+ PullIfNewer = buildah.PullIfNewer
|
|
|
f93050 |
PullNever = buildah.PullNever
|
|
|
f93050 |
|
|
|
f93050 |
Gzip = archive.Gzip
|
|
|
f93050 |
@@ -45,7 +46,7 @@ type BuildOptions struct {
|
|
|
f93050 |
// commands.
|
|
|
f93050 |
ContextDirectory string
|
|
|
f93050 |
// PullPolicy controls whether or not we pull images. It should be one
|
|
|
f93050 |
- // of PullIfMissing, PullAlways, or PullNever.
|
|
|
f93050 |
+ // of PullIfMissing, PullAlways, PullIfNewer, or PullNever.
|
|
|
f93050 |
PullPolicy buildah.PullPolicy
|
|
|
f93050 |
// Registry is a value which is prepended to the image's name, if it
|
|
|
f93050 |
// needs to be pulled and the image name alone can not be resolved to a
|
|
|
f93050 |
diff --git a/vendor/github.com/containers/buildah/imagebuildah/executor.go b/vendor/github.com/containers/buildah/imagebuildah/executor.go
|
|
|
f93050 |
index 27ec1bb23bbb..35fc3d63d4fc 100644
|
|
|
f93050 |
--- a/vendor/github.com/containers/buildah/imagebuildah/executor.go
|
|
|
f93050 |
+++ b/vendor/github.com/containers/buildah/imagebuildah/executor.go
|
|
|
f93050 |
@@ -339,6 +339,11 @@ func (b *Executor) Build(ctx context.Context, stages imagebuilder.Stages) (image
|
|
|
f93050 |
var cleanupImages []string
|
|
|
f93050 |
cleanupStages := make(map[int]*StageExecutor)
|
|
|
f93050 |
|
|
|
f93050 |
+ stdout := b.out
|
|
|
f93050 |
+ if b.quiet {
|
|
|
f93050 |
+ b.out = ioutil.Discard
|
|
|
f93050 |
+ }
|
|
|
f93050 |
+
|
|
|
f93050 |
cleanup := func() error {
|
|
|
f93050 |
var lastErr error
|
|
|
f93050 |
// Clean up any containers associated with the final container
|
|
|
f93050 |
@@ -527,6 +532,10 @@ func (b *Executor) Build(ctx context.Context, stages imagebuilder.Stages) (image
|
|
|
f93050 |
if err = ioutil.WriteFile(b.iidfile, []byte(imageID), 0644); err != nil {
|
|
|
f93050 |
return imageID, ref, errors.Wrapf(err, "failed to write image ID to file %q", b.iidfile)
|
|
|
f93050 |
}
|
|
|
f93050 |
+ } else {
|
|
|
f93050 |
+ if _, err := stdout.Write([]byte(imageID + "\n")); err != nil {
|
|
|
f93050 |
+ return imageID, ref, errors.Wrapf(err, "failed to write image ID to stdout")
|
|
|
f93050 |
+ }
|
|
|
f93050 |
}
|
|
|
f93050 |
|
|
|
f93050 |
return imageID, ref, nil
|
|
|
f93050 |
diff --git a/vendor/github.com/containers/buildah/imagebuildah/stage_executor.go b/vendor/github.com/containers/buildah/imagebuildah/stage_executor.go
|
|
|
f93050 |
index fad2bfe9558d..67c0a0eb9454 100644
|
|
|
f93050 |
--- a/vendor/github.com/containers/buildah/imagebuildah/stage_executor.go
|
|
|
f93050 |
+++ b/vendor/github.com/containers/buildah/imagebuildah/stage_executor.go
|
|
|
f93050 |
@@ -318,7 +318,7 @@ func (s *StageExecutor) digestSpecifiedContent(node *parser.Node, argValues []st
|
|
|
f93050 |
// directory.
|
|
|
f93050 |
contextSrc, err := securejoin.SecureJoin(contextDir, src)
|
|
|
f93050 |
if err != nil {
|
|
|
f93050 |
- return "", errors.Wrapf(err, "error joining %q and %q", contextDir, src)
|
|
|
f93050 |
+ return "", errors.Wrapf(err, "forbidden path for %q, it is outside of the build context %q", src, contextDir)
|
|
|
f93050 |
}
|
|
|
f93050 |
sources = append(sources, contextSrc)
|
|
|
f93050 |
}
|
|
|
f93050 |
@@ -432,7 +432,7 @@ func (s *StageExecutor) Copy(excludes []string, copies ...imagebuilder.Copy) err
|
|
|
f93050 |
// directory.
|
|
|
f93050 |
srcSecure, err := securejoin.SecureJoin(contextDir, src)
|
|
|
f93050 |
if err != nil {
|
|
|
f93050 |
- return err
|
|
|
f93050 |
+ return errors.Wrapf(err, "forbidden path for %q, it is outside of the build context %q", src, contextDir)
|
|
|
f93050 |
}
|
|
|
f93050 |
if hadFinalPathSeparator {
|
|
|
f93050 |
// If destination is a folder, we need to take extra care to
|
|
|
f93050 |
diff --git a/vendor/github.com/containers/buildah/import.go b/vendor/github.com/containers/buildah/import.go
|
|
|
f93050 |
index 751ce6ae1c8d..329633b442a4 100644
|
|
|
f93050 |
--- a/vendor/github.com/containers/buildah/import.go
|
|
|
f93050 |
+++ b/vendor/github.com/containers/buildah/import.go
|
|
|
f93050 |
@@ -5,8 +5,10 @@ import (
|
|
|
f93050 |
|
|
|
f93050 |
"github.com/containers/buildah/docker"
|
|
|
f93050 |
"github.com/containers/buildah/util"
|
|
|
f93050 |
+ "github.com/containers/image/v5/image"
|
|
|
f93050 |
"github.com/containers/image/v5/manifest"
|
|
|
f93050 |
is "github.com/containers/image/v5/storage"
|
|
|
f93050 |
+ "github.com/containers/image/v5/transports"
|
|
|
f93050 |
"github.com/containers/image/v5/types"
|
|
|
f93050 |
"github.com/containers/storage"
|
|
|
f93050 |
digest "github.com/opencontainers/go-digest"
|
|
|
f93050 |
@@ -28,12 +30,39 @@ func importBuilderDataFromImage(ctx context.Context, store storage.Store, system
|
|
|
f93050 |
if err != nil {
|
|
|
f93050 |
return nil, errors.Wrapf(err, "no such image %q", imageID)
|
|
|
f93050 |
}
|
|
|
f93050 |
- src, err2 := ref.NewImage(ctx, systemContext)
|
|
|
f93050 |
- if err2 != nil {
|
|
|
f93050 |
- return nil, errors.Wrapf(err2, "error instantiating image")
|
|
|
f93050 |
+ src, err := ref.NewImageSource(ctx, systemContext)
|
|
|
f93050 |
+ if err != nil {
|
|
|
f93050 |
+ return nil, errors.Wrapf(err, "error instantiating image source")
|
|
|
f93050 |
}
|
|
|
f93050 |
defer src.Close()
|
|
|
f93050 |
|
|
|
f93050 |
+ imageDigest := ""
|
|
|
f93050 |
+ manifestBytes, manifestType, err := src.GetManifest(ctx, nil)
|
|
|
f93050 |
+ if err != nil {
|
|
|
f93050 |
+ return nil, errors.Wrapf(err, "error loading image manifest for %q", transports.ImageName(ref))
|
|
|
f93050 |
+ }
|
|
|
f93050 |
+ if manifestDigest, err := manifest.Digest(manifestBytes); err == nil {
|
|
|
f93050 |
+ imageDigest = manifestDigest.String()
|
|
|
f93050 |
+ }
|
|
|
f93050 |
+
|
|
|
f93050 |
+ var instanceDigest *digest.Digest
|
|
|
f93050 |
+ if manifest.MIMETypeIsMultiImage(manifestType) {
|
|
|
f93050 |
+ list, err := manifest.ListFromBlob(manifestBytes, manifestType)
|
|
|
f93050 |
+ if err != nil {
|
|
|
f93050 |
+ return nil, errors.Wrapf(err, "error parsing image manifest for %q as list", transports.ImageName(ref))
|
|
|
f93050 |
+ }
|
|
|
f93050 |
+ instance, err := list.ChooseInstance(systemContext)
|
|
|
f93050 |
+ if err != nil {
|
|
|
f93050 |
+ return nil, errors.Wrapf(err, "error finding an appropriate image in manifest list %q", transports.ImageName(ref))
|
|
|
f93050 |
+ }
|
|
|
f93050 |
+ instanceDigest = &instance
|
|
|
f93050 |
+ }
|
|
|
f93050 |
+
|
|
|
f93050 |
+ image, err := image.FromUnparsedImage(ctx, systemContext, image.UnparsedInstance(src, instanceDigest))
|
|
|
f93050 |
+ if err != nil {
|
|
|
f93050 |
+ return nil, errors.Wrapf(err, "error instantiating image for %q instance %q", transports.ImageName(ref), instanceDigest)
|
|
|
f93050 |
+ }
|
|
|
f93050 |
+
|
|
|
f93050 |
imageName := ""
|
|
|
f93050 |
if img, err3 := store.Image(imageID); err3 == nil {
|
|
|
f93050 |
if len(img.Names) > 0 {
|
|
|
f93050 |
@@ -48,13 +77,6 @@ func importBuilderDataFromImage(ctx context.Context, store storage.Store, system
|
|
|
f93050 |
}
|
|
|
f93050 |
}
|
|
|
f93050 |
|
|
|
f93050 |
- imageDigest := ""
|
|
|
f93050 |
- if manifestBytes, _, err := src.Manifest(ctx); err == nil {
|
|
|
f93050 |
- if manifestDigest, err := manifest.Digest(manifestBytes); err == nil {
|
|
|
f93050 |
- imageDigest = manifestDigest.String()
|
|
|
f93050 |
- }
|
|
|
f93050 |
- }
|
|
|
f93050 |
-
|
|
|
f93050 |
defaultNamespaceOptions, err := DefaultNamespaceOptions()
|
|
|
f93050 |
if err != nil {
|
|
|
f93050 |
return nil, err
|
|
|
f93050 |
@@ -79,7 +101,7 @@ func importBuilderDataFromImage(ctx context.Context, store storage.Store, system
|
|
|
f93050 |
},
|
|
|
f93050 |
}
|
|
|
f93050 |
|
|
|
f93050 |
- if err := builder.initConfig(ctx, src); err != nil {
|
|
|
f93050 |
+ if err := builder.initConfig(ctx, image); err != nil {
|
|
|
f93050 |
return nil, errors.Wrapf(err, "error preparing image configuration")
|
|
|
f93050 |
}
|
|
|
f93050 |
|
|
|
f93050 |
diff --git a/vendor/github.com/containers/buildah/info.go b/vendor/github.com/containers/buildah/info.go
|
|
|
f93050 |
index c741bb449e11..322bd8834dff 100644
|
|
|
f93050 |
--- a/vendor/github.com/containers/buildah/info.go
|
|
|
f93050 |
+++ b/vendor/github.com/containers/buildah/info.go
|
|
|
f93050 |
@@ -52,10 +52,13 @@ func hostInfo() map[string]interface{} {
|
|
|
f93050 |
logrus.Error(err, "err reading cgroups mode")
|
|
|
f93050 |
}
|
|
|
f93050 |
cgroupVersion := "v1"
|
|
|
f93050 |
+ ociruntime := "runc"
|
|
|
f93050 |
if unified {
|
|
|
f93050 |
cgroupVersion = "v2"
|
|
|
f93050 |
+ ociruntime = "crun"
|
|
|
f93050 |
}
|
|
|
f93050 |
info["CgroupVersion"] = cgroupVersion
|
|
|
f93050 |
+ info["OCIRuntime"] = ociruntime
|
|
|
f93050 |
|
|
|
f93050 |
mi, err := system.ReadMemInfo()
|
|
|
f93050 |
if err != nil {
|
|
|
f93050 |
diff --git a/vendor/github.com/containers/buildah/new.go b/vendor/github.com/containers/buildah/new.go
|
|
|
f93050 |
index 87cfd5d0da6c..68c6ebd544ea 100644
|
|
|
f93050 |
--- a/vendor/github.com/containers/buildah/new.go
|
|
|
f93050 |
+++ b/vendor/github.com/containers/buildah/new.go
|
|
|
f93050 |
@@ -5,8 +5,10 @@ import (
|
|
|
f93050 |
"fmt"
|
|
|
f93050 |
"math/rand"
|
|
|
f93050 |
"strings"
|
|
|
f93050 |
+ "time"
|
|
|
f93050 |
|
|
|
f93050 |
"github.com/containers/buildah/util"
|
|
|
f93050 |
+ "github.com/containers/image/v5/image"
|
|
|
f93050 |
"github.com/containers/image/v5/manifest"
|
|
|
f93050 |
"github.com/containers/image/v5/pkg/sysregistriesv2"
|
|
|
f93050 |
is "github.com/containers/image/v5/storage"
|
|
|
f93050 |
@@ -14,6 +16,7 @@ import (
|
|
|
f93050 |
"github.com/containers/image/v5/transports/alltransports"
|
|
|
f93050 |
"github.com/containers/image/v5/types"
|
|
|
f93050 |
"github.com/containers/storage"
|
|
|
f93050 |
+ digest "github.com/opencontainers/go-digest"
|
|
|
f93050 |
"github.com/openshift/imagebuilder"
|
|
|
f93050 |
"github.com/pkg/errors"
|
|
|
f93050 |
"github.com/sirupsen/logrus"
|
|
|
f93050 |
@@ -154,23 +157,47 @@ func resolveImage(ctx context.Context, systemContext *types.SystemContext, store
|
|
|
f93050 |
if destImage == "" {
|
|
|
f93050 |
return nil, "", nil, errors.Errorf("error computing local image name for %q", transports.ImageName(srcRef))
|
|
|
f93050 |
}
|
|
|
f93050 |
-
|
|
|
f93050 |
ref, err := is.Transport.ParseStoreReference(store, destImage)
|
|
|
f93050 |
if err != nil {
|
|
|
f93050 |
return nil, "", nil, errors.Wrapf(err, "error parsing reference to image %q", destImage)
|
|
|
f93050 |
}
|
|
|
f93050 |
- img, err := is.Transport.GetStoreImage(store, ref)
|
|
|
f93050 |
- if err == nil {
|
|
|
f93050 |
- return ref, transport, img, nil
|
|
|
f93050 |
- }
|
|
|
f93050 |
|
|
|
f93050 |
- if errors.Cause(err) == storage.ErrImageUnknown && options.PullPolicy != PullIfMissing {
|
|
|
f93050 |
- logrus.Debugf("no such image %q: %v", transports.ImageName(ref), err)
|
|
|
f93050 |
- failures = append(failures, failure{
|
|
|
f93050 |
- resolvedImageName: image,
|
|
|
f93050 |
- err: fmt.Errorf("no such image %q", transports.ImageName(ref)),
|
|
|
f93050 |
- })
|
|
|
f93050 |
- continue
|
|
|
f93050 |
+ if options.PullPolicy == PullIfNewer {
|
|
|
f93050 |
+ img, err := is.Transport.GetStoreImage(store, ref)
|
|
|
f93050 |
+ if err == nil {
|
|
|
f93050 |
+ // Let's see if this image is on the repository and if it's there
|
|
|
f93050 |
+ // then note it's Created date.
|
|
|
f93050 |
+ var repoImageCreated time.Time
|
|
|
f93050 |
+ repoImageFound := false
|
|
|
f93050 |
+ repoImage, err := srcRef.NewImage(ctx, systemContext)
|
|
|
f93050 |
+ if err == nil {
|
|
|
f93050 |
+ inspect, err := repoImage.Inspect(ctx)
|
|
|
f93050 |
+ if err == nil {
|
|
|
f93050 |
+ repoImageFound = true
|
|
|
f93050 |
+ repoImageCreated = *inspect.Created
|
|
|
f93050 |
+ }
|
|
|
f93050 |
+ repoImage.Close()
|
|
|
f93050 |
+ }
|
|
|
f93050 |
+ if !repoImageFound || repoImageCreated == img.Created {
|
|
|
f93050 |
+ // The image is only local or the same date is on the
|
|
|
f93050 |
+ // local and repo versions of the image, no need to pull.
|
|
|
f93050 |
+ return ref, transport, img, nil
|
|
|
f93050 |
+ }
|
|
|
f93050 |
+ }
|
|
|
f93050 |
+ } else {
|
|
|
f93050 |
+ // Get the image from the store if present for PullNever and PullIfMissing
|
|
|
f93050 |
+ img, err := is.Transport.GetStoreImage(store, ref)
|
|
|
f93050 |
+ if err == nil {
|
|
|
f93050 |
+ return ref, transport, img, nil
|
|
|
f93050 |
+ }
|
|
|
f93050 |
+ if errors.Cause(err) == storage.ErrImageUnknown && options.PullPolicy == PullNever {
|
|
|
f93050 |
+ logrus.Debugf("no such image %q: %v", transports.ImageName(ref), err)
|
|
|
f93050 |
+ failures = append(failures, failure{
|
|
|
f93050 |
+ resolvedImageName: image,
|
|
|
f93050 |
+ err: fmt.Errorf("no such image %q", transports.ImageName(ref)),
|
|
|
f93050 |
+ })
|
|
|
f93050 |
+ continue
|
|
|
f93050 |
+ }
|
|
|
f93050 |
}
|
|
|
f93050 |
|
|
|
f93050 |
pulledImg, pulledReference, err := pullAndFindImage(ctx, store, srcRef, options, systemContext)
|
|
|
f93050 |
@@ -253,35 +280,53 @@ func newBuilder(ctx context.Context, store storage.Store, options BuilderOptions
|
|
|
f93050 |
return nil, err
|
|
|
f93050 |
}
|
|
|
f93050 |
}
|
|
|
f93050 |
- image := options.FromImage
|
|
|
f93050 |
+ imageSpec := options.FromImage
|
|
|
f93050 |
imageID := ""
|
|
|
f93050 |
imageDigest := ""
|
|
|
f93050 |
topLayer := ""
|
|
|
f93050 |
if img != nil {
|
|
|
f93050 |
- image = getImageName(imageNamePrefix(image), img)
|
|
|
f93050 |
+ imageSpec = getImageName(imageNamePrefix(imageSpec), img)
|
|
|
f93050 |
imageID = img.ID
|
|
|
f93050 |
topLayer = img.TopLayer
|
|
|
f93050 |
}
|
|
|
f93050 |
- var src types.ImageCloser
|
|
|
f93050 |
+ var src types.Image
|
|
|
f93050 |
if ref != nil {
|
|
|
f93050 |
- src, err = ref.NewImage(ctx, systemContext)
|
|
|
f93050 |
+ srcSrc, err := ref.NewImageSource(ctx, systemContext)
|
|
|
f93050 |
if err != nil {
|
|
|
f93050 |
return nil, errors.Wrapf(err, "error instantiating image for %q", transports.ImageName(ref))
|
|
|
f93050 |
}
|
|
|
f93050 |
- if manifestBytes, _, err := src.Manifest(ctx); err == nil {
|
|
|
f93050 |
- if manifestDigest, err := manifest.Digest(manifestBytes); err == nil {
|
|
|
f93050 |
- imageDigest = manifestDigest.String()
|
|
|
f93050 |
+ defer srcSrc.Close()
|
|
|
f93050 |
+ manifestBytes, manifestType, err := srcSrc.GetManifest(ctx, nil)
|
|
|
f93050 |
+ if err != nil {
|
|
|
f93050 |
+ return nil, errors.Wrapf(err, "error loading image manifest for %q", transports.ImageName(ref))
|
|
|
f93050 |
+ }
|
|
|
f93050 |
+ if manifestDigest, err := manifest.Digest(manifestBytes); err == nil {
|
|
|
f93050 |
+ imageDigest = manifestDigest.String()
|
|
|
f93050 |
+ }
|
|
|
f93050 |
+ var instanceDigest *digest.Digest
|
|
|
f93050 |
+ if manifest.MIMETypeIsMultiImage(manifestType) {
|
|
|
f93050 |
+ list, err := manifest.ListFromBlob(manifestBytes, manifestType)
|
|
|
f93050 |
+ if err != nil {
|
|
|
f93050 |
+ return nil, errors.Wrapf(err, "error parsing image manifest for %q as list", transports.ImageName(ref))
|
|
|
f93050 |
+ }
|
|
|
f93050 |
+ instance, err := list.ChooseInstance(systemContext)
|
|
|
f93050 |
+ if err != nil {
|
|
|
f93050 |
+ return nil, errors.Wrapf(err, "error finding an appropriate image in manifest list %q", transports.ImageName(ref))
|
|
|
f93050 |
}
|
|
|
f93050 |
+ instanceDigest = &instance
|
|
|
f93050 |
+ }
|
|
|
f93050 |
+ src, err = image.FromUnparsedImage(ctx, systemContext, image.UnparsedInstance(srcSrc, instanceDigest))
|
|
|
f93050 |
+ if err != nil {
|
|
|
f93050 |
+ return nil, errors.Wrapf(err, "error instantiating image for %q instance %q", transports.ImageName(ref), instanceDigest)
|
|
|
f93050 |
}
|
|
|
f93050 |
- defer src.Close()
|
|
|
f93050 |
}
|
|
|
f93050 |
|
|
|
f93050 |
name := "working-container"
|
|
|
f93050 |
if options.Container != "" {
|
|
|
f93050 |
name = options.Container
|
|
|
f93050 |
} else {
|
|
|
f93050 |
- if image != "" {
|
|
|
f93050 |
- name = imageNamePrefix(image) + "-" + name
|
|
|
f93050 |
+ if imageSpec != "" {
|
|
|
f93050 |
+ name = imageNamePrefix(imageSpec) + "-" + name
|
|
|
f93050 |
}
|
|
|
f93050 |
}
|
|
|
f93050 |
var container *storage.Container
|
|
|
f93050 |
@@ -332,7 +377,7 @@ func newBuilder(ctx context.Context, store storage.Store, options BuilderOptions
|
|
|
f93050 |
builder := &Builder{
|
|
|
f93050 |
store: store,
|
|
|
f93050 |
Type: containerType,
|
|
|
f93050 |
- FromImage: image,
|
|
|
f93050 |
+ FromImage: imageSpec,
|
|
|
f93050 |
FromImageID: imageID,
|
|
|
f93050 |
FromImageDigest: imageDigest,
|
|
|
f93050 |
Container: name,
|
|
|
f93050 |
diff --git a/vendor/github.com/containers/buildah/pkg/cli/common.go b/vendor/github.com/containers/buildah/pkg/cli/common.go
|
|
|
f93050 |
index e8979cd7f86f..6f49cc2406a7 100644
|
|
|
f93050 |
--- a/vendor/github.com/containers/buildah/pkg/cli/common.go
|
|
|
f93050 |
+++ b/vendor/github.com/containers/buildah/pkg/cli/common.go
|
|
|
f93050 |
@@ -63,6 +63,7 @@ type BudResults struct {
|
|
|
f93050 |
Platform string
|
|
|
f93050 |
Pull bool
|
|
|
f93050 |
PullAlways bool
|
|
|
f93050 |
+ PullNever bool
|
|
|
f93050 |
Quiet bool
|
|
|
f93050 |
Rm bool
|
|
|
f93050 |
Runtime string
|
|
|
f93050 |
@@ -159,8 +160,9 @@ func GetBudFlags(flags *BudResults) pflag.FlagSet {
|
|
|
f93050 |
fs.StringVar(&flags.Logfile, "logfile", "", "log to `file` instead of stdout/stderr")
|
|
|
f93050 |
fs.IntVar(&flags.Loglevel, "loglevel", 0, "adjust logging level (range from -2 to 3)")
|
|
|
f93050 |
fs.StringVar(&flags.Platform, "platform", "", "CLI compatibility: no action or effect")
|
|
|
f93050 |
- fs.BoolVar(&flags.Pull, "pull", true, "pull the image if not present")
|
|
|
f93050 |
- fs.BoolVar(&flags.PullAlways, "pull-always", false, "pull the image, even if a version is present")
|
|
|
f93050 |
+ fs.BoolVar(&flags.Pull, "pull", true, "pull the image from the registry if newer or not present in store, if false, only pull the image if not present")
|
|
|
f93050 |
+ fs.BoolVar(&flags.PullAlways, "pull-always", false, "pull the image even if the named image is present in store")
|
|
|
f93050 |
+ fs.BoolVar(&flags.PullNever, "pull-never", false, "do not pull the image, use the image present in store if available")
|
|
|
f93050 |
fs.BoolVarP(&flags.Quiet, "quiet", "q", false, "refrain from announcing build instructions and image read/write progress")
|
|
|
f93050 |
fs.BoolVar(&flags.Rm, "rm", true, "Remove intermediate containers after a successful build")
|
|
|
f93050 |
// "runtime" definition moved to avoid name collision in podman build. Defined in cmd/buildah/bud.go.
|
|
|
f93050 |
@@ -265,9 +267,15 @@ func VerifyFlagsArgsOrder(args []string) error {
|
|
|
f93050 |
}
|
|
|
f93050 |
|
|
|
f93050 |
func GetDefaultAuthFile() string {
|
|
|
f93050 |
- authfile := os.Getenv("REGISTRY_AUTH_FILE")
|
|
|
f93050 |
- if authfile != "" {
|
|
|
f93050 |
- return authfile
|
|
|
f93050 |
+ return os.Getenv("REGISTRY_AUTH_FILE")
|
|
|
f93050 |
+}
|
|
|
f93050 |
+
|
|
|
f93050 |
+func CheckAuthFile(authfile string) error {
|
|
|
f93050 |
+ if authfile == "" {
|
|
|
f93050 |
+ return nil
|
|
|
f93050 |
}
|
|
|
f93050 |
- return ""
|
|
|
f93050 |
+ if _, err := os.Stat(authfile); err != nil {
|
|
|
f93050 |
+ return errors.Wrapf(err, "error checking authfile path %s", authfile)
|
|
|
f93050 |
+ }
|
|
|
f93050 |
+ return nil
|
|
|
f93050 |
}
|
|
|
f93050 |
diff --git a/vendor/github.com/containers/buildah/pkg/secrets/secrets.go b/vendor/github.com/containers/buildah/pkg/secrets/secrets.go
|
|
|
f93050 |
index ee2e9a7c84fe..80ca050165bd 100644
|
|
|
f93050 |
--- a/vendor/github.com/containers/buildah/pkg/secrets/secrets.go
|
|
|
f93050 |
+++ b/vendor/github.com/containers/buildah/pkg/secrets/secrets.go
|
|
|
f93050 |
@@ -148,21 +148,12 @@ func getMountsMap(path string) (string, string, error) {
|
|
|
f93050 |
}
|
|
|
f93050 |
|
|
|
f93050 |
// SecretMounts copies, adds, and mounts the secrets to the container root filesystem
|
|
|
f93050 |
-// Deprecated, Please use SecretMountWithUIDGID
|
|
|
f93050 |
func SecretMounts(mountLabel, containerWorkingDir, mountFile string, rootless, disableFips bool) []rspec.Mount {
|
|
|
f93050 |
return SecretMountsWithUIDGID(mountLabel, containerWorkingDir, mountFile, containerWorkingDir, 0, 0, rootless, disableFips)
|
|
|
f93050 |
}
|
|
|
f93050 |
|
|
|
f93050 |
-// SecretMountsWithUIDGID copies, adds, and mounts the secrets to the container root filesystem
|
|
|
f93050 |
-// mountLabel: MAC/SELinux label for container content
|
|
|
f93050 |
-// containerWorkingDir: Private data for storing secrets on the host mounted in container.
|
|
|
f93050 |
-// mountFile: Additional mount points required for the container.
|
|
|
f93050 |
-// mountPoint: Container image mountpoint
|
|
|
f93050 |
-// uid: to assign to content created for secrets
|
|
|
f93050 |
-// gid: to assign to content created for secrets
|
|
|
f93050 |
-// rootless: indicates whether container is running in rootless mode
|
|
|
f93050 |
-// disableFips: indicates whether system should ignore fips mode
|
|
|
f93050 |
-func SecretMountsWithUIDGID(mountLabel, containerWorkingDir, mountFile, mountPoint string, uid, gid int, rootless, disableFips bool) []rspec.Mount {
|
|
|
f93050 |
+// SecretMountsWithUIDGID specifies the uid/gid of the owner
|
|
|
f93050 |
+func SecretMountsWithUIDGID(mountLabel, containerWorkingDir, mountFile, mountPrefix string, uid, gid int, rootless, disableFips bool) []rspec.Mount {
|
|
|
f93050 |
var (
|
|
|
f93050 |
secretMounts []rspec.Mount
|
|
|
f93050 |
mountFiles []string
|
|
|
f93050 |
@@ -180,7 +171,7 @@ func SecretMountsWithUIDGID(mountLabel, containerWorkingDir, mountFile, mountPoi
|
|
|
f93050 |
}
|
|
|
f93050 |
for _, file := range mountFiles {
|
|
|
f93050 |
if _, err := os.Stat(file); err == nil {
|
|
|
f93050 |
- mounts, err := addSecretsFromMountsFile(file, mountLabel, containerWorkingDir, uid, gid)
|
|
|
f93050 |
+ mounts, err := addSecretsFromMountsFile(file, mountLabel, containerWorkingDir, mountPrefix, uid, gid)
|
|
|
f93050 |
if err != nil {
|
|
|
f93050 |
logrus.Warnf("error mounting secrets, skipping entry in %s: %v", file, err)
|
|
|
f93050 |
}
|
|
|
f93050 |
@@ -196,7 +187,7 @@ func SecretMountsWithUIDGID(mountLabel, containerWorkingDir, mountFile, mountPoi
|
|
|
f93050 |
// Add FIPS mode secret if /etc/system-fips exists on the host
|
|
|
f93050 |
_, err := os.Stat("/etc/system-fips")
|
|
|
f93050 |
if err == nil {
|
|
|
f93050 |
- if err := addFIPSModeSecret(&secretMounts, containerWorkingDir, mountPoint, mountLabel, uid, gid); err != nil {
|
|
|
f93050 |
+ if err := addFIPSModeSecret(&secretMounts, containerWorkingDir, mountPrefix, mountLabel, uid, gid); err != nil {
|
|
|
f93050 |
logrus.Errorf("error adding FIPS mode secret to container: %v", err)
|
|
|
f93050 |
}
|
|
|
f93050 |
} else if os.IsNotExist(err) {
|
|
|
f93050 |
@@ -215,7 +206,7 @@ func rchown(chowndir string, uid, gid int) error {
|
|
|
f93050 |
|
|
|
f93050 |
// addSecretsFromMountsFile copies the contents of host directory to container directory
|
|
|
f93050 |
// and returns a list of mounts
|
|
|
f93050 |
-func addSecretsFromMountsFile(filePath, mountLabel, containerWorkingDir string, uid, gid int) ([]rspec.Mount, error) {
|
|
|
f93050 |
+func addSecretsFromMountsFile(filePath, mountLabel, containerWorkingDir, mountPrefix string, uid, gid int) ([]rspec.Mount, error) {
|
|
|
f93050 |
var mounts []rspec.Mount
|
|
|
f93050 |
defaultMountsPaths := getMounts(filePath)
|
|
|
f93050 |
for _, path := range defaultMountsPaths {
|
|
|
f93050 |
@@ -294,7 +285,7 @@ func addSecretsFromMountsFile(filePath, mountLabel, containerWorkingDir string,
|
|
|
f93050 |
}
|
|
|
f93050 |
|
|
|
f93050 |
m := rspec.Mount{
|
|
|
f93050 |
- Source: ctrDirOrFileOnHost,
|
|
|
f93050 |
+ Source: filepath.Join(mountPrefix, ctrDirOrFile),
|
|
|
f93050 |
Destination: ctrDirOrFile,
|
|
|
f93050 |
Type: "bind",
|
|
|
f93050 |
Options: []string{"bind", "rprivate"},
|
|
|
f93050 |
@@ -309,15 +300,15 @@ func addSecretsFromMountsFile(filePath, mountLabel, containerWorkingDir string,
|
|
|
f93050 |
// root filesystem if /etc/system-fips exists on hosts.
|
|
|
f93050 |
// This enables the container to be FIPS compliant and run openssl in
|
|
|
f93050 |
// FIPS mode as the host is also in FIPS mode.
|
|
|
f93050 |
-func addFIPSModeSecret(mounts *[]rspec.Mount, containerWorkingDir, mountPoint, mountLabel string, uid, gid int) error {
|
|
|
f93050 |
+func addFIPSModeSecret(mounts *[]rspec.Mount, containerWorkingDir, mountPrefix, mountLabel string, uid, gid int) error {
|
|
|
f93050 |
secretsDir := "/run/secrets"
|
|
|
f93050 |
ctrDirOnHost := filepath.Join(containerWorkingDir, secretsDir)
|
|
|
f93050 |
if _, err := os.Stat(ctrDirOnHost); os.IsNotExist(err) {
|
|
|
f93050 |
if err = idtools.MkdirAllAs(ctrDirOnHost, 0755, uid, gid); err != nil {
|
|
|
f93050 |
- return errors.Wrapf(err, "making container directory %q on host failed", ctrDirOnHost)
|
|
|
f93050 |
+ return errors.Wrapf(err, "making container directory on host failed")
|
|
|
f93050 |
}
|
|
|
f93050 |
if err = label.Relabel(ctrDirOnHost, mountLabel, false); err != nil {
|
|
|
f93050 |
- return errors.Wrapf(err, "error applying correct labels on %q", ctrDirOnHost)
|
|
|
f93050 |
+ return errors.Wrap(err, "error applying correct labels")
|
|
|
f93050 |
}
|
|
|
f93050 |
}
|
|
|
f93050 |
fipsFile := filepath.Join(ctrDirOnHost, "system-fips")
|
|
|
f93050 |
@@ -332,7 +323,7 @@ func addFIPSModeSecret(mounts *[]rspec.Mount, containerWorkingDir, mountPoint, m
|
|
|
f93050 |
|
|
|
f93050 |
if !mountExists(*mounts, secretsDir) {
|
|
|
f93050 |
m := rspec.Mount{
|
|
|
f93050 |
- Source: ctrDirOnHost,
|
|
|
f93050 |
+ Source: filepath.Join(mountPrefix, secretsDir),
|
|
|
f93050 |
Destination: secretsDir,
|
|
|
f93050 |
Type: "bind",
|
|
|
f93050 |
Options: []string{"bind", "rprivate"},
|
|
|
f93050 |
@@ -340,25 +331,6 @@ func addFIPSModeSecret(mounts *[]rspec.Mount, containerWorkingDir, mountPoint, m
|
|
|
f93050 |
*mounts = append(*mounts, m)
|
|
|
f93050 |
}
|
|
|
f93050 |
|
|
|
f93050 |
- srcBackendDir := "/usr/share/crypto-policies/back-ends/FIPS"
|
|
|
f93050 |
- destDir := "/etc/crypto-policies/back-ends"
|
|
|
f93050 |
- srcOnHost := filepath.Join(mountPoint, srcBackendDir)
|
|
|
f93050 |
- if _, err := os.Stat(srcOnHost); err != nil {
|
|
|
f93050 |
- if os.IsNotExist(err) {
|
|
|
f93050 |
- return nil
|
|
|
f93050 |
- }
|
|
|
f93050 |
- return errors.Wrapf(err, "failed to stat FIPS Backend directory %q", ctrDirOnHost)
|
|
|
f93050 |
- }
|
|
|
f93050 |
-
|
|
|
f93050 |
- if !mountExists(*mounts, destDir) {
|
|
|
f93050 |
- m := rspec.Mount{
|
|
|
f93050 |
- Source: srcOnHost,
|
|
|
f93050 |
- Destination: destDir,
|
|
|
f93050 |
- Type: "bind",
|
|
|
f93050 |
- Options: []string{"bind", "rprivate"},
|
|
|
f93050 |
- }
|
|
|
f93050 |
- *mounts = append(*mounts, m)
|
|
|
f93050 |
- }
|
|
|
f93050 |
return nil
|
|
|
f93050 |
}
|
|
|
f93050 |
|
|
|
f93050 |
diff --git a/vendor/github.com/docker/docker/AUTHORS b/vendor/github.com/docker/docker/AUTHORS
|
|
|
f93050 |
index d5b6cbbead48..ad166ba8df6c 100644
|
|
|
f93050 |
--- a/vendor/github.com/docker/docker/AUTHORS
|
|
|
f93050 |
+++ b/vendor/github.com/docker/docker/AUTHORS
|
|
|
f93050 |
@@ -18,6 +18,7 @@ Abhishek Chanda <abhishek.becs@gmail.com>
|
|
|
f93050 |
Abhishek Sharma <abhishek@asharma.me>
|
|
|
f93050 |
Abin Shahab <ashahab@altiscale.com>
|
|
|
f93050 |
Adam Avilla <aavilla@yp.com>
|
|
|
f93050 |
+Adam Dobrawy <naczelnik@jawnosc.tk>
|
|
|
f93050 |
Adam Eijdenberg <adam.eijdenberg@gmail.com>
|
|
|
f93050 |
Adam Kunk <adam.kunk@tiaa-cref.org>
|
|
|
f93050 |
Adam Miller <admiller@redhat.com>
|
|
|
f93050 |
@@ -113,6 +114,7 @@ Anda Xu <anda.xu@docker.com>
|
|
|
f93050 |
Anders Janmyr <anders@janmyr.com>
|
|
|
f93050 |
Andre Dublin <81dublin@gmail.com>
|
|
|
f93050 |
Andre Granovsky <robotciti@live.com>
|
|
|
f93050 |
+Andrea Denisse Gómez <crypto.andrea@protonmail.ch>
|
|
|
f93050 |
Andrea Luzzardi <aluzzardi@gmail.com>
|
|
|
f93050 |
Andrea Turli <andrea.turli@gmail.com>
|
|
|
f93050 |
Andreas Elvers <andreas@work.de>
|
|
|
f93050 |
@@ -177,8 +179,10 @@ Anusha Ragunathan <anusha.ragunathan@docker.com>
|
|
|
f93050 |
apocas <petermdias@gmail.com>
|
|
|
f93050 |
Arash Deshmeh <adeshmeh@ca.ibm.com>
|
|
|
f93050 |
ArikaChen <eaglesora@gmail.com>
|
|
|
f93050 |
+Arko Dasgupta <arko.dasgupta@docker.com>
|
|
|
f93050 |
Arnaud Lefebvre <a.lefebvre@outlook.fr>
|
|
|
f93050 |
Arnaud Porterie <arnaud.porterie@docker.com>
|
|
|
f93050 |
+Arnaud Rebillout <arnaud.rebillout@collabora.com>
|
|
|
f93050 |
Arthur Barr <arthur.barr@uk.ibm.com>
|
|
|
f93050 |
Arthur Gautier <baloo@gandi.net>
|
|
|
f93050 |
Artur Meyster <arthurfbi@yahoo.com>
|
|
|
f93050 |
@@ -280,6 +284,7 @@ Carl Loa Odin <carlodin@gmail.com>
|
|
|
f93050 |
Carl X. Su <bcbcarl@gmail.com>
|
|
|
f93050 |
Carlo Mion <mion00@gmail.com>
|
|
|
f93050 |
Carlos Alexandro Becker <caarlos0@gmail.com>
|
|
|
f93050 |
+Carlos de Paula <me@carlosedp.com>
|
|
|
f93050 |
Carlos Sanchez <carlos@apache.org>
|
|
|
f93050 |
Carol Fager-Higgins <carol.fager-higgins@docker.com>
|
|
|
f93050 |
Cary <caryhartline@users.noreply.github.com>
|
|
|
f93050 |
@@ -329,6 +334,7 @@ Chris Gibson <chris@chrisg.io>
|
|
|
f93050 |
Chris Khoo <chris.khoo@gmail.com>
|
|
|
f93050 |
Chris McKinnel <chris.mckinnel@tangentlabs.co.uk>
|
|
|
f93050 |
Chris McKinnel <chrismckinnel@gmail.com>
|
|
|
f93050 |
+Chris Price <chris.price@docker.com>
|
|
|
f93050 |
Chris Seto <chriskseto@gmail.com>
|
|
|
f93050 |
Chris Snow <chsnow123@gmail.com>
|
|
|
f93050 |
Chris St. Pierre <chris.a.st.pierre@gmail.com>
|
|
|
f93050 |
@@ -418,12 +424,14 @@ Daniel Norberg <dano@spotify.com>
|
|
|
f93050 |
Daniel Nordberg <dnordberg@gmail.com>
|
|
|
f93050 |
Daniel Robinson <gottagetmac@gmail.com>
|
|
|
f93050 |
Daniel S <dan.streby@gmail.com>
|
|
|
f93050 |
+Daniel Sweet <danieljsweet@icloud.com>
|
|
|
f93050 |
Daniel Von Fange <daniel@leancoder.com>
|
|
|
f93050 |
Daniel Watkins <daniel@daniel-watkins.co.uk>
|
|
|
f93050 |
Daniel X Moore <yahivin@gmail.com>
|
|
|
f93050 |
Daniel YC Lin <dlin.tw@gmail.com>
|
|
|
f93050 |
Daniel Zhang <jmzwcn@gmail.com>
|
|
|
f93050 |
Danny Berger <dpb587@gmail.com>
|
|
|
f93050 |
+Danny Milosavljevic <dannym@scratchpost.org>
|
|
|
f93050 |
Danny Yates <danny@codeaholics.org>
|
|
|
f93050 |
Danyal Khaliq <danyal.khaliq@tenpearls.com>
|
|
|
f93050 |
Darren Coxall <darren@darrencoxall.com>
|
|
|
f93050 |
@@ -517,6 +525,8 @@ Dmitry Smirnov <onlyjob@member.fsf.org>
|
|
|
f93050 |
Dmitry V. Krivenok <krivenok.dmitry@gmail.com>
|
|
|
f93050 |
Dmitry Vorobev <dimahabr@gmail.com>
|
|
|
f93050 |
Dolph Mathews <dolph.mathews@gmail.com>
|
|
|
f93050 |
+Dominic Tubach <dominic.tubach@to.com>
|
|
|
f93050 |
+Dominic Yin <yindongchao@inspur.com>
|
|
|
f93050 |
Dominik Dingel <dingel@linux.vnet.ibm.com>
|
|
|
f93050 |
Dominik Finkbeiner <finkes93@gmail.com>
|
|
|
f93050 |
Dominik Honnef <dominik@honnef.co>
|
|
|
f93050 |
@@ -585,6 +595,7 @@ Erik Weathers <erikdw@gmail.com>
|
|
|
f93050 |
Erno Hopearuoho <erno.hopearuoho@gmail.com>
|
|
|
f93050 |
Erwin van der Koogh <info@erronis.nl>
|
|
|
f93050 |
Ethan Bell <ebgamer29@gmail.com>
|
|
|
f93050 |
+Ethan Mosbaugh <ethan@replicated.com>
|
|
|
f93050 |
Euan Kemp <euan.kemp@coreos.com>
|
|
|
f93050 |
Eugen Krizo <eugen.krizo@gmail.com>
|
|
|
f93050 |
Eugene Yakubovich <eugene.yakubovich@coreos.com>
|
|
|
f93050 |
@@ -621,6 +632,7 @@ Fareed Dudhia <fareeddudhia@googlemail.com>
|
|
|
f93050 |
Fathi Boudra <fathi.boudra@linaro.org>
|
|
|
f93050 |
Federico Gimenez <fgimenez@coit.es>
|
|
|
f93050 |
Felipe Oliveira <felipeweb.programador@gmail.com>
|
|
|
f93050 |
+Felipe Ruhland <felipe.ruhland@gmail.com>
|
|
|
f93050 |
Felix Abecassis <fabecassis@nvidia.com>
|
|
|
f93050 |
Felix Geisendörfer <felix@debuggable.com>
|
|
|
f93050 |
Felix Hupfeld <felix@quobyte.com>
|
|
|
f93050 |
@@ -655,6 +667,7 @@ Frank Groeneveld <frank@ivaldi.nl>
|
|
|
f93050 |
Frank Herrmann <fgh@4gh.tv>
|
|
|
f93050 |
Frank Macreery <frank@macreery.com>
|
|
|
f93050 |
Frank Rosquin <frank.rosquin+github@gmail.com>
|
|
|
f93050 |
+frankyang <yyb196@gmail.com>
|
|
|
f93050 |
Fred Lifton <fred.lifton@docker.com>
|
|
|
f93050 |
Frederick F. Kautz IV <fkautz@redhat.com>
|
|
|
f93050 |
Frederik Loeffert <frederik@zitrusmedia.de>
|
|
|
f93050 |
@@ -702,6 +715,7 @@ Gleb M Borisov <borisov.gleb@gmail.com>
|
|
|
f93050 |
Glyn Normington <gnormington@gopivotal.com>
|
|
|
f93050 |
GoBella <caili_welcome@163.com>
|
|
|
f93050 |
Goffert van Gool <goffert@phusion.nl>
|
|
|
f93050 |
+Goldwyn Rodrigues <rgoldwyn@suse.com>
|
|
|
f93050 |
Gopikannan Venugopalsamy <gopikannan.venugopalsamy@gmail.com>
|
|
|
f93050 |
Gosuke Miyashita <gosukenator@gmail.com>
|
|
|
f93050 |
Gou Rao <gou@portworx.com>
|
|
|
f93050 |
@@ -725,6 +739,7 @@ Guruprasad <lgp171188@gmail.com>
|
|
|
f93050 |
Gustav Sinder <gustav.sinder@gmail.com>
|
|
|
f93050 |
gwx296173 <gaojing3@huawei.com>
|
|
|
f93050 |
Günter Zöchbauer <guenter@gzoechbauer.com>
|
|
|
f93050 |
+Haichao Yang <yang.haichao@zte.com.cn>
|
|
|
f93050 |
haikuoliu <haikuo@amazon.com>
|
|
|
f93050 |
Hakan Özler <hakan.ozler@kodcu.com>
|
|
|
f93050 |
Hamish Hutchings <moredhel@aoeu.me>
|
|
|
f93050 |
@@ -733,6 +748,7 @@ Hans Rødtang <hansrodtang@gmail.com>
|
|
|
f93050 |
Hao Shu Wei <haosw@cn.ibm.com>
|
|
|
f93050 |
Hao Zhang <21521210@zju.edu.cn>
|
|
|
f93050 |
Harald Albers <github@albersweb.de>
|
|
|
f93050 |
+Harald Niesche <harald@niesche.de>
|
|
|
f93050 |
Harley Laue <losinggeneration@gmail.com>
|
|
|
f93050 |
Harold Cooper <hrldcpr@gmail.com>
|
|
|
f93050 |
Harrison Turton <harrisonturton@gmail.com>
|
|
|
f93050 |
@@ -752,9 +768,11 @@ Hobofan <goisser94@gmail.com>
|
|
|
f93050 |
Hollie Teal <hollie@docker.com>
|
|
|
f93050 |
Hong Xu <hong@topbug.net>
|
|
|
f93050 |
Hongbin Lu <hongbin034@gmail.com>
|
|
|
f93050 |
+Hongxu Jia <hongxu.jia@windriver.com>
|
|
|
f93050 |
hsinko <21551195@zju.edu.cn>
|
|
|
f93050 |
Hu Keping <hukeping@huawei.com>
|
|
|
f93050 |
Hu Tao <hutao@cn.fujitsu.com>
|
|
|
f93050 |
+HuanHuan Ye <logindaveye@gmail.com>
|
|
|
f93050 |
Huanzhong Zhang <zhanghuanzhong90@gmail.com>
|
|
|
f93050 |
Huayi Zhang <irachex@gmail.com>
|
|
|
f93050 |
Hugo Duncan <hugo@hugoduncan.org>
|
|
|
f93050 |
@@ -898,6 +916,7 @@ Jie Luo <luo612@zju.edu.cn>
|
|
|
f93050 |
Jihyun Hwang <jhhwang@telcoware.com>
|
|
|
f93050 |
Jilles Oldenbeuving <ojilles@gmail.com>
|
|
|
f93050 |
Jim Alateras <jima@comware.com.au>
|
|
|
f93050 |
+Jim Ehrismann <jim.ehrismann@docker.com>
|
|
|
f93050 |
Jim Galasyn <jim.galasyn@docker.com>
|
|
|
f93050 |
Jim Minter <jminter@redhat.com>
|
|
|
f93050 |
Jim Perrin <jperrin@centos.org>
|
|
|
f93050 |
@@ -935,7 +954,7 @@ John Feminella <jxf@jxf.me>
|
|
|
f93050 |
John Gardiner Myers <jgmyers@proofpoint.com>
|
|
|
f93050 |
John Gossman <johngos@microsoft.com>
|
|
|
f93050 |
John Harris <john@johnharris.io>
|
|
|
f93050 |
-John Howard (VM) <John.Howard@microsoft.com>
|
|
|
f93050 |
+John Howard <github@lowenna.com>
|
|
|
f93050 |
John Laswell <john.n.laswell@gmail.com>
|
|
|
f93050 |
John Maguire <jmaguire@duosecurity.com>
|
|
|
f93050 |
John Mulhausen <john@docker.com>
|
|
|
f93050 |
@@ -949,6 +968,7 @@ John Willis <john.willis@docker.com>
|
|
|
f93050 |
Jon Johnson <jonjohnson@google.com>
|
|
|
f93050 |
Jon Surrell <jon.surrell@gmail.com>
|
|
|
f93050 |
Jon Wedaman <jweede@gmail.com>
|
|
|
f93050 |
+Jonas Dohse <jonas@dohse.ch>
|
|
|
f93050 |
Jonas Pfenniger <jonas@pfenniger.name>
|
|
|
f93050 |
Jonathan A. Schweder <jonathanschweder@gmail.com>
|
|
|
f93050 |
Jonathan A. Sternberg <jonathansternberg@gmail.com>
|
|
|
f93050 |
@@ -1002,6 +1022,7 @@ Julio Montes <imc.coder@gmail.com>
|
|
|
f93050 |
Jun-Ru Chang <jrjang@gmail.com>
|
|
|
f93050 |
Jussi Nummelin <jussi.nummelin@gmail.com>
|
|
|
f93050 |
Justas Brazauskas <brazauskasjustas@gmail.com>
|
|
|
f93050 |
+Justen Martin <jmart@the-coder.com>
|
|
|
f93050 |
Justin Cormack <justin.cormack@docker.com>
|
|
|
f93050 |
Justin Force <justin.force@gmail.com>
|
|
|
f93050 |
Justin Menga <justin.menga@gmail.com>
|
|
|
f93050 |
@@ -1010,6 +1031,7 @@ Justin Simonelis <justin.p.simonelis@gmail.com>
|
|
|
f93050 |
Justin Terry <juterry@microsoft.com>
|
|
|
f93050 |
Justyn Temme <justyntemme@gmail.com>
|
|
|
f93050 |
Jyrki Puttonen <jyrkiput@gmail.com>
|
|
|
f93050 |
+Jérémy Leherpeur <amenophis@leherpeur.net>
|
|
|
f93050 |
Jérôme Petazzoni <jerome.petazzoni@docker.com>
|
|
|
f93050 |
Jörg Thalheim <joerg@higgsboson.tk>
|
|
|
f93050 |
K. Heller <pestophagous@gmail.com>
|
|
|
f93050 |
@@ -1047,6 +1069,7 @@ Ken Reese <krrgithub@gmail.com>
|
|
|
f93050 |
Kenfe-Mickaël Laventure <mickael.laventure@gmail.com>
|
|
|
f93050 |
Kenjiro Nakayama <nakayamakenjiro@gmail.com>
|
|
|
f93050 |
Kent Johnson <kentoj@gmail.com>
|
|
|
f93050 |
+Kenta Tada <Kenta.Tada@sony.com>
|
|
|
f93050 |
Kevin "qwazerty" Houdebert <kevin.houdebert@gmail.com>
|
|
|
f93050 |
Kevin Burke <kev@inburke.com>
|
|
|
f93050 |
Kevin Clark <kevin.clark@gmail.com>
|
|
|
f93050 |
@@ -1057,6 +1080,7 @@ Kevin Kern <kaiwentan@harmonycloud.cn>
|
|
|
f93050 |
Kevin Menard <kevin@nirvdrum.com>
|
|
|
f93050 |
Kevin Meredith <kevin.m.meredith@gmail.com>
|
|
|
f93050 |
Kevin P. Kucharczyk <kevinkucharczyk@gmail.com>
|
|
|
f93050 |
+Kevin Parsons <kevpar@microsoft.com>
|
|
|
f93050 |
Kevin Richardson <kevin@kevinrichardson.co>
|
|
|
f93050 |
Kevin Shi <kshi@andrew.cmu.edu>
|
|
|
f93050 |
Kevin Wallace <kevin@pentabarf.net>
|
|
|
f93050 |
@@ -1147,6 +1171,7 @@ longliqiang88 <394564827@qq.com>
|
|
|
f93050 |
Lorenz Leutgeb <lorenz.leutgeb@gmail.com>
|
|
|
f93050 |
Lorenzo Fontana <fontanalorenz@gmail.com>
|
|
|
f93050 |
Lotus Fenn <fenn.lotus@gmail.com>
|
|
|
f93050 |
+Louis Delossantos <ldelossa.ld@gmail.com>
|
|
|
f93050 |
Louis Opter <kalessin@kalessin.fr>
|
|
|
f93050 |
Luca Favatella <luca.favatella@erlang-solutions.com>
|
|
|
f93050 |
Luca Marturana <lucamarturana@gmail.com>
|
|
|
f93050 |
@@ -1159,12 +1184,14 @@ Lucas Silvestre <lukas.silvestre@gmail.com>
|
|
|
f93050 |
Luciano Mores <leslau@gmail.com>
|
|
|
f93050 |
Luis Martínez de Bartolomé Izquierdo <lmartinez@biicode.com>
|
|
|
f93050 |
Luiz Svoboda <luizek@gmail.com>
|
|
|
f93050 |
+Lukas Heeren <lukas-heeren@hotmail.com>
|
|
|
f93050 |
Lukas Waslowski <cr7pt0gr4ph7@gmail.com>
|
|
|
f93050 |
lukaspustina <lukas.pustina@centerdevice.com>
|
|
|
f93050 |
Lukasz Zajaczkowski <Lukasz.Zajaczkowski@ts.fujitsu.com>
|
|
|
f93050 |
Luke Marsden <me@lukemarsden.net>
|
|
|
f93050 |
Lyn <energylyn@zju.edu.cn>
|
|
|
f93050 |
Lynda O'Leary <lyndaoleary29@gmail.com>
|
|
|
f93050 |
+lzhfromutsc <lzhfromustc@gmail.com>
|
|
|
f93050 |
Lénaïc Huard <lhuard@amadeus.com>
|
|
|
f93050 |
Ma Müller <mueller-ma@users.noreply.github.com>
|
|
|
f93050 |
Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
|
|
|
f93050 |
@@ -1298,6 +1325,7 @@ Michael Stapelberg <michael+gh@stapelberg.de>
|
|
|
f93050 |
Michael Steinert <mike.steinert@gmail.com>
|
|
|
f93050 |
Michael Thies <michaelthies78@gmail.com>
|
|
|
f93050 |
Michael West <mwest@mdsol.com>
|
|
|
f93050 |
+Michael Zhao <michael.zhao@arm.com>
|
|
|
f93050 |
Michal Fojtik <mfojtik@redhat.com>
|
|
|
f93050 |
Michal Gebauer <mishak@mishak.net>
|
|
|
f93050 |
Michal Jemala <michal.jemala@gmail.com>
|
|
|
f93050 |
@@ -1382,6 +1410,7 @@ Neyazul Haque <nuhaque@gmail.com>
|
|
|
f93050 |
Nghia Tran <nghia@google.com>
|
|
|
f93050 |
Niall O'Higgins <niallo@unworkable.org>
|
|
|
f93050 |
Nicholas E. Rabenau <nerab@gmx.at>
|
|
|
f93050 |
+Nick Adcock <nick.adcock@docker.com>
|
|
|
f93050 |
Nick DeCoursin <n.decoursin@foodpanda.com>
|
|
|
f93050 |
Nick Irvine <nfirvine@nfirvine.com>
|
|
|
f93050 |
Nick Neisen <nwneisen@gmail.com>
|
|
|
f93050 |
@@ -1420,6 +1449,7 @@ Nuutti Kotivuori <naked@iki.fi>
|
|
|
f93050 |
nzwsch <hi@nzwsch.com>
|
|
|
f93050 |
O.S. Tezer <ostezer@gmail.com>
|
|
|
f93050 |
objectified <objectified@gmail.com>
|
|
|
f93050 |
+Odin Ugedal <odin@ugedal.com>
|
|
|
f93050 |
Oguz Bilgic <fisyonet@gmail.com>
|
|
|
f93050 |
Oh Jinkyun <tintypemolly@gmail.com>
|
|
|
f93050 |
Ohad Schneider <ohadschn@users.noreply.github.com>
|
|
|
f93050 |
@@ -1430,6 +1460,7 @@ Oliver Reason <oli@overrateddev.co>
|
|
|
f93050 |
Olivier Gambier <dmp42@users.noreply.github.com>
|
|
|
f93050 |
Olle Jonsson <olle.jonsson@gmail.com>
|
|
|
f93050 |
Olli Janatuinen <olli.janatuinen@gmail.com>
|
|
|
f93050 |
+Olly Pomeroy <oppomeroy@gmail.com>
|
|
|
f93050 |
Omri Shiv <Omri.Shiv@teradata.com>
|
|
|
f93050 |
Oriol Francès <oriolfa@gmail.com>
|
|
|
f93050 |
Oskar Niburski <oskarniburski@gmail.com>
|
|
|
f93050 |
@@ -1439,6 +1470,7 @@ Ovidio Mallo <ovidio.mallo@gmail.com>
|
|
|
f93050 |
Panagiotis Moustafellos <pmoust@elastic.co>
|
|
|
f93050 |
Paolo G. Giarrusso <p.giarrusso@gmail.com>
|
|
|
f93050 |
Pascal <pascalgn@users.noreply.github.com>
|
|
|
f93050 |
+Pascal Bach <pascal.bach@siemens.com>
|
|
|
f93050 |
Pascal Borreli <pascal@borreli.com>
|
|
|
f93050 |
Pascal Hartig <phartig@rdrei.net>
|
|
|
f93050 |
Patrick Böänziger <patrick.baenziger@bsi-software.com>
|
|
|
f93050 |
@@ -1463,6 +1495,7 @@ Paul Nasrat <pnasrat@gmail.com>
|
|
|
f93050 |
Paul Weaver <pauweave@cisco.com>
|
|
|
f93050 |
Paulo Ribeiro <paigr.io@gmail.com>
|
|
|
f93050 |
Pavel Lobashov <ShockwaveNN@gmail.com>
|
|
|
f93050 |
+Pavel Matěja <pavel@verotel.cz>
|
|
|
f93050 |
Pavel Pletenev <cpp.create@gmail.com>
|
|
|
f93050 |
Pavel Pospisil <pospispa@gmail.com>
|
|
|
f93050 |
Pavel Sutyrin <pavel.sutyrin@gmail.com>
|
|
|
f93050 |
@@ -1574,6 +1607,7 @@ Riku Voipio <riku.voipio@linaro.org>
|
|
|
f93050 |
Riley Guerin <rileytg.dev@gmail.com>
|
|
|
f93050 |
Ritesh H Shukla <sritesh@vmware.com>
|
|
|
f93050 |
Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
|
|
|
f93050 |
+Rob Gulewich <rgulewich@netflix.com>
|
|
|
f93050 |
Rob Vesse <rvesse@dotnetrdf.org>
|
|
|
f93050 |
Robert Bachmann <rb@robertbachmann.at>
|
|
|
f93050 |
Robert Bittle <guywithnose@gmail.com>
|
|
|
f93050 |
@@ -1582,11 +1616,13 @@ Robert Schneider <mail@shakeme.info>
|
|
|
f93050 |
Robert Stern <lexandro2000@gmail.com>
|
|
|
f93050 |
Robert Terhaar <rterhaar@atlanticdynamic.com>
|
|
|
f93050 |
Robert Wallis <smilingrob@gmail.com>
|
|
|
f93050 |
+Robert Wang <robert@arctic.tw>
|
|
|
f93050 |
Roberto G. Hashioka <roberto.hashioka@docker.com>
|
|
|
f93050 |
Roberto Muñoz Fernández <robertomf@gmail.com>
|
|
|
f93050 |
Robin Naundorf <r.naundorf@fh-muenster.de>
|
|
|
f93050 |
Robin Schneider <ypid@riseup.net>
|
|
|
f93050 |
Robin Speekenbrink <robin@kingsquare.nl>
|
|
|
f93050 |
+Robin Thoni <robin@rthoni.com>
|
|
|
f93050 |
robpc <rpcann@gmail.com>
|
|
|
f93050 |
Rodolfo Carvalho <rhcarvalho@gmail.com>
|
|
|
f93050 |
Rodrigo Vaz <rodrigo.vaz@gmail.com>
|
|
|
f93050 |
@@ -1620,6 +1656,7 @@ Rozhnov Alexandr <nox73@ya.ru>
|
|
|
f93050 |
Rudolph Gottesheim <r.gottesheim@loot.at>
|
|
|
f93050 |
Rui Cao <ruicao@alauda.io>
|
|
|
f93050 |
Rui Lopes <rgl@ruilopes.com>
|
|
|
f93050 |
+Ruilin Li <liruilin4@huawei.com>
|
|
|
f93050 |
Runshen Zhu <runshen.zhu@gmail.com>
|
|
|
f93050 |
Russ Magee <rmagee@gmail.com>
|
|
|
f93050 |
Ryan Abrams <rdabrams@gmail.com>
|
|
|
f93050 |
@@ -1658,6 +1695,7 @@ Sam J Sharpe <sam.sharpe@digital.cabinet-office.gov.uk>
|
|
|
f93050 |
Sam Neirinck <sam@samneirinck.com>
|
|
|
f93050 |
Sam Reis <sreis@atlassian.com>
|
|
|
f93050 |
Sam Rijs <srijs@airpost.net>
|
|
|
f93050 |
+Sam Whited <sam@samwhited.com>
|
|
|
f93050 |
Sambuddha Basu <sambuddhabasu1@gmail.com>
|
|
|
f93050 |
Sami Wagiaalla <swagiaal@redhat.com>
|
|
|
f93050 |
Samuel Andaya <samuel@andaya.net>
|
|
|
f93050 |
@@ -1672,6 +1710,7 @@ sapphiredev <se.imas.kr@gmail.com>
|
|
|
f93050 |
Sargun Dhillon <sargun@netflix.com>
|
|
|
f93050 |
Sascha Andres <sascha.andres@outlook.com>
|
|
|
f93050 |
Sascha Grunert <sgrunert@suse.com>
|
|
|
f93050 |
+SataQiu <qiushida@beyondcent.com>
|
|
|
f93050 |
Satnam Singh <satnam@raintown.org>
|
|
|
f93050 |
Satoshi Amemiya <satoshi_amemiya@voyagegroup.com>
|
|
|
f93050 |
Satoshi Tagomori <tagomoris@gmail.com>
|
|
|
f93050 |
@@ -1720,6 +1759,7 @@ Shijun Qin <qinshijun16@mails.ucas.ac.cn>
|
|
|
f93050 |
Shishir Mahajan <shishir.mahajan@redhat.com>
|
|
|
f93050 |
Shoubhik Bose <sbose78@gmail.com>
|
|
|
f93050 |
Shourya Sarcar <shourya.sarcar@gmail.com>
|
|
|
f93050 |
+Shu-Wai Chow <shu-wai.chow@seattlechildrens.org>
|
|
|
f93050 |
shuai-z <zs.broccoli@gmail.com>
|
|
|
f93050 |
Shukui Yang <yangshukui@huawei.com>
|
|
|
f93050 |
Shuwei Hao <haosw@cn.ibm.com>
|
|
|
f93050 |
@@ -1730,6 +1770,7 @@ Silas Sewell <silas@sewell.org>
|
|
|
f93050 |
Silvan Jegen <s.jegen@gmail.com>
|
|
|
f93050 |
Simão Reis <smnrsti@gmail.com>
|
|
|
f93050 |
Simei He <hesimei@zju.edu.cn>
|
|
|
f93050 |
+Simon Barendse <simon.barendse@gmail.com>
|
|
|
f93050 |
Simon Eskildsen <sirup@sirupsen.com>
|
|
|
f93050 |
Simon Ferquel <simon.ferquel@docker.com>
|
|
|
f93050 |
Simon Leinen <simon.leinen@gmail.com>
|
|
|
f93050 |
@@ -1738,6 +1779,7 @@ Simon Taranto <simon.taranto@gmail.com>
|
|
|
f93050 |
Simon Vikstrom <pullreq@devsn.se>
|
|
|
f93050 |
Sindhu S <sindhus@live.in>
|
|
|
f93050 |
Sjoerd Langkemper <sjoerd-github@linuxonly.nl>
|
|
|
f93050 |
+skanehira <sho19921005@gmail.com>
|
|
|
f93050 |
Solganik Alexander <solganik@gmail.com>
|
|
|
f93050 |
Solomon Hykes <solomon@docker.com>
|
|
|
f93050 |
Song Gao <song@gao.io>
|
|
|
f93050 |
@@ -1749,6 +1791,7 @@ Sridatta Thatipamala <sthatipamala@gmail.com>
|
|
|
f93050 |
Sridhar Ratnakumar <sridharr@activestate.com>
|
|
|
f93050 |
Srini Brahmaroutu <srbrahma@us.ibm.com>
|
|
|
f93050 |
Srinivasan Srivatsan <srinivasan.srivatsan@hpe.com>
|
|
|
f93050 |
+Staf Wagemakers <staf@wagemakers.be>
|
|
|
f93050 |
Stanislav Bondarenko <stanislav.bondarenko@gmail.com>
|
|
|
f93050 |
Steeve Morin <steeve.morin@gmail.com>
|
|
|
f93050 |
Stefan Berger <stefanb@linux.vnet.ibm.com>
|
|
|
f93050 |
@@ -1759,6 +1802,7 @@ Stefan Scherer <stefan.scherer@docker.com>
|
|
|
f93050 |
Stefan Staudenmeyer <doerte@instana.com>
|
|
|
f93050 |
Stefan Weil <sw@weilnetz.de>
|
|
|
f93050 |
Stephan Spindler <shutefan@gmail.com>
|
|
|
f93050 |
+Stephen Benjamin <stephen@redhat.com>
|
|
|
f93050 |
Stephen Crosby <stevecrozz@gmail.com>
|
|
|
f93050 |
Stephen Day <stephen.day@docker.com>
|
|
|
f93050 |
Stephen Drake <stephen@xenolith.net>
|
|
|
f93050 |
@@ -1775,10 +1819,12 @@ Steven Iveson <sjiveson@outlook.com>
|
|
|
f93050 |
Steven Merrill <steven.merrill@gmail.com>
|
|
|
f93050 |
Steven Richards <steven@axiomzen.co>
|
|
|
f93050 |
Steven Taylor <steven.taylor@me.com>
|
|
|
f93050 |
+Stig Larsson <stig@larsson.dev>
|
|
|
f93050 |
Subhajit Ghosh <isubuz.g@gmail.com>
|
|
|
f93050 |
Sujith Haridasan <sujith.h@gmail.com>
|
|
|
f93050 |
Sun Gengze <690388648@qq.com>
|
|
|
f93050 |
Sun Jianbo <wonderflow.sun@gmail.com>
|
|
|
f93050 |
+Sune Keller <sune.keller@gmail.com>
|
|
|
f93050 |
Sunny Gogoi <indiasuny000@gmail.com>
|
|
|
f93050 |
Suryakumar Sudar <surya.trunks@gmail.com>
|
|
|
f93050 |
Sven Dowideit <SvenDowideit@home.org.au>
|
|
|
f93050 |
@@ -1829,6 +1875,7 @@ Tianyi Wang <capkurmagati@gmail.com>
|
|
|
f93050 |
Tibor Vass <teabee89@gmail.com>
|
|
|
f93050 |
Tiffany Jernigan <tiffany.f.j@gmail.com>
|
|
|
f93050 |
Tiffany Low <tiffany@box.com>
|
|
|
f93050 |
+Tim <elatllat@gmail.com>
|
|
|
f93050 |
Tim Bart <tim@fewagainstmany.com>
|
|
|
f93050 |
Tim Bosse <taim@bosboot.org>
|
|
|
f93050 |
Tim Dettrick <t.dettrick@uq.edu.au>
|
|
|
f93050 |
@@ -1914,6 +1961,7 @@ Victor Palma <palma.victor@gmail.com>
|
|
|
f93050 |
Victor Vieux <victor.vieux@docker.com>
|
|
|
f93050 |
Victoria Bialas <victoria.bialas@docker.com>
|
|
|
f93050 |
Vijaya Kumar K <vijayak@caviumnetworks.com>
|
|
|
f93050 |
+Vikram bir Singh <vikrambir.singh@docker.com>
|
|
|
f93050 |
Viktor Stanchev <me@viktorstanchev.com>
|
|
|
f93050 |
Viktor Vojnovski <viktor.vojnovski@amadeus.com>
|
|
|
f93050 |
VinayRaghavanKS <raghavan.vinay@gmail.com>
|
|
|
f93050 |
@@ -1971,6 +2019,7 @@ Wenyu You <21551128@zju.edu.cn>
|
|
|
f93050 |
Wenzhi Liang <wenzhi.liang@gmail.com>
|
|
|
f93050 |
Wes Morgan <cap10morgan@gmail.com>
|
|
|
f93050 |
Wewang Xiaorenfine <wang.xiaoren@zte.com.cn>
|
|
|
f93050 |
+Wiktor Kwapisiewicz <wiktor@metacode.biz>
|
|
|
f93050 |
Will Dietz <w@wdtz.org>
|
|
|
f93050 |
Will Rouesnel <w.rouesnel@gmail.com>
|
|
|
f93050 |
Will Weaver <monkey@buildingbananas.com>
|
|
|
f93050 |
@@ -1998,6 +2047,7 @@ xichengliudui <1693291525@qq.com>
|
|
|
f93050 |
xiekeyang <xiekeyang@huawei.com>
|
|
|
f93050 |
Ximo Guanter Gonzálbez <joaquin.guantergonzalbez@telefonica.com>
|
|
|
f93050 |
Xinbo Weng <xihuanbo_0521@zju.edu.cn>
|
|
|
f93050 |
+Xinfeng Liu <xinfeng.liu@gmail.com>
|
|
|
f93050 |
Xinzi Zhou <imdreamrunner@gmail.com>
|
|
|
f93050 |
Xiuming Chen <cc@cxm.cc>
|
|
|
f93050 |
Xuecong Liao <satorulogic@gmail.com>
|
|
|
f93050 |
@@ -2012,6 +2062,7 @@ Yang Pengfei <yangpengfei4@huawei.com>
|
|
|
f93050 |
yangchenliang <yangchenliang@huawei.com>
|
|
|
f93050 |
Yanqiang Miao <miao.yanqiang@zte.com.cn>
|
|
|
f93050 |
Yao Zaiyong <yaozaiyong@hotmail.com>
|
|
|
f93050 |
+Yash Murty <yashmurty@gmail.com>
|
|
|
f93050 |
Yassine Tijani <yasstij11@gmail.com>
|
|
|
f93050 |
Yasunori Mahata <nori@mahata.net>
|
|
|
f93050 |
Yazhong Liu <yorkiefixer@gmail.com>
|
|
|
f93050 |
@@ -2026,6 +2077,7 @@ Yongxin Li <yxli@alauda.io>
|
|
|
f93050 |
Yongzhi Pan <panyongzhi@gmail.com>
|
|
|
f93050 |
Yosef Fertel <yfertel@gmail.com>
|
|
|
f93050 |
You-Sheng Yang (楊有勝) <vicamo@gmail.com>
|
|
|
f93050 |
+youcai <omegacoleman@gmail.com>
|
|
|
f93050 |
Youcef YEKHLEF <yyekhlef@gmail.com>
|
|
|
f93050 |
Yu Changchun <yuchangchun1@huawei.com>
|
|
|
f93050 |
Yu Chengxia <yuchengxia@huawei.com>
|
|
|
f93050 |
@@ -2062,6 +2114,7 @@ Zhoulin Xie <zhoulin.xie@daocloud.io>
|
|
|
f93050 |
Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
|
|
|
f93050 |
Zhu Kunjia <zhu.kunjia@zte.com.cn>
|
|
|
f93050 |
Zhuoyun Wei <wzyboy@wzyboy.org>
|
|
|
f93050 |
+Ziheng Liu <lzhfromustc@gmail.com>
|
|
|
f93050 |
Zilin Du <zilin.du@gmail.com>
|
|
|
f93050 |
zimbatm <zimbatm@zimbatm.com>
|
|
|
f93050 |
Ziming Dong <bnudzm@foxmail.com>
|
|
|
f93050 |
@@ -2070,7 +2123,7 @@ zmarouf <zeid.marouf@gmail.com>
|
|
|
f93050 |
Zoltan Tombol <zoltan.tombol@gmail.com>
|
|
|
f93050 |
Zou Yu <zouyu7@huawei.com>
|
|
|
f93050 |
zqh <zqhxuyuan@gmail.com>
|
|
|
f93050 |
-Zuhayr Elahi <elahi.zuhayr@gmail.com>
|
|
|
f93050 |
+Zuhayr Elahi <zuhayr.elahi@docker.com>
|
|
|
f93050 |
Zunayed Ali <zunayed@gmail.com>
|
|
|
f93050 |
Álex González <agonzalezro@gmail.com>
|
|
|
f93050 |
Álvaro Lázaro <alvaro.lazaro.g@gmail.com>
|
|
|
f93050 |
diff --git a/vendor/github.com/docker/docker/api/swagger.yaml b/vendor/github.com/docker/docker/api/swagger.yaml
|
|
|
f93050 |
index cc2451f033a4..0698bba526d6 100644
|
|
|
f93050 |
--- a/vendor/github.com/docker/docker/api/swagger.yaml
|
|
|
f93050 |
+++ b/vendor/github.com/docker/docker/api/swagger.yaml
|
|
|
f93050 |
@@ -3369,6 +3369,27 @@ definitions:
|
|
|
f93050 |
format: "dateTime"
|
|
|
f93050 |
Message:
|
|
|
f93050 |
type: "string"
|
|
|
f93050 |
+ ServiceStatus:
|
|
|
f93050 |
+ description: |
|
|
|
f93050 |
+ The status of the service's tasks. Provided only when requested as
|
|
|
f93050 |
+ part of a ServiceList operation.
|
|
|
f93050 |
+ type: "object"
|
|
|
f93050 |
+ properties:
|
|
|
f93050 |
+ RunningTasks:
|
|
|
f93050 |
+ description: "The number of tasks for the service currently in the Running state"
|
|
|
f93050 |
+ type: "integer"
|
|
|
f93050 |
+ format: "uint64"
|
|
|
f93050 |
+ example: 7
|
|
|
f93050 |
+ DesiredTasks:
|
|
|
f93050 |
+ description: |
|
|
|
f93050 |
+ The number of tasks for the service desired to be running.
|
|
|
f93050 |
+ For replicated services, this is the replica count from the
|
|
|
f93050 |
+ service spec. For global services, this is computed by taking
|
|
|
f93050 |
+ count of all tasks for the service with a Desired State other
|
|
|
f93050 |
+ than Shutdown.
|
|
|
f93050 |
+ type: "integer"
|
|
|
f93050 |
+ format: "uint64"
|
|
|
f93050 |
+ example: 10
|
|
|
f93050 |
example:
|
|
|
f93050 |
ID: "9mnpnzenvg8p8tdbtq4wvbkcz"
|
|
|
f93050 |
Version:
|
|
|
f93050 |
@@ -4924,6 +4945,8 @@ paths:
|
|
|
f93050 |
type: "integer"
|
|
|
f93050 |
Driver:
|
|
|
f93050 |
type: "string"
|
|
|
f93050 |
+ Platform:
|
|
|
f93050 |
+ type: "string"
|
|
|
f93050 |
MountLabel:
|
|
|
f93050 |
type: "string"
|
|
|
f93050 |
ProcessLabel:
|
|
|
f93050 |
@@ -9316,6 +9339,10 @@ paths:
|
|
|
f93050 |
- `label=<service label>`
|
|
|
f93050 |
- `mode=["replicated"|"global"]`
|
|
|
f93050 |
- `name=<service name>`
|
|
|
f93050 |
+ - name: "status"
|
|
|
f93050 |
+ in: "query"
|
|
|
f93050 |
+ type: "boolean"
|
|
|
f93050 |
+ description: "Include service status, with count of running and desired tasks"
|
|
|
f93050 |
tags: ["Service"]
|
|
|
f93050 |
/services/create:
|
|
|
f93050 |
post:
|
|
|
f93050 |
@@ -10414,9 +10441,6 @@ paths:
|
|
|
f93050 |
description: |
|
|
|
f93050 |
Start a new interactive session with a server. Session allows server to call back to the client for advanced capabilities.
|
|
|
f93050 |
|
|
|
f93050 |
- > **Note**: This endpoint is *experimental* and only available if the daemon is started with experimental
|
|
|
f93050 |
- > features enabled. The specifications for this endpoint may still change in a future version of the API.
|
|
|
f93050 |
-
|
|
|
f93050 |
### Hijacking
|
|
|
f93050 |
|
|
|
f93050 |
This endpoint hijacks the HTTP connection to HTTP2 transport that allows the client to expose gPRC services on that connection.
|
|
|
f93050 |
@@ -10450,4 +10474,4 @@ paths:
|
|
|
f93050 |
description: "server error"
|
|
|
f93050 |
schema:
|
|
|
f93050 |
$ref: "#/definitions/ErrorResponse"
|
|
|
f93050 |
- tags: ["Session (experimental)"]
|
|
|
f93050 |
+ tags: ["Session"]
|
|
|
f93050 |
diff --git a/vendor/github.com/docker/docker/api/types/client.go b/vendor/github.com/docker/docker/api/types/client.go
|
|
|
f93050 |
index 4b9f50282b1f..8363ed736e3a 100644
|
|
|
f93050 |
--- a/vendor/github.com/docker/docker/api/types/client.go
|
|
|
f93050 |
+++ b/vendor/github.com/docker/docker/api/types/client.go
|
|
|
f93050 |
@@ -363,6 +363,10 @@ type ServiceUpdateOptions struct {
|
|
|
f93050 |
// ServiceListOptions holds parameters to list services with.
|
|
|
f93050 |
type ServiceListOptions struct {
|
|
|
f93050 |
Filters filters.Args
|
|
|
f93050 |
+
|
|
|
f93050 |
+ // Status indicates whether the server should include the service task
|
|
|
f93050 |
+ // count of running and desired tasks.
|
|
|
f93050 |
+ Status bool
|
|
|
f93050 |
}
|
|
|
f93050 |
|
|
|
f93050 |
// ServiceInspectOptions holds parameters related to the "service inspect"
|
|
|
f93050 |
diff --git a/vendor/github.com/docker/docker/api/types/filters/parse.go b/vendor/github.com/docker/docker/api/types/filters/parse.go
|
|
|
f93050 |
index 2e24e769c10e..cd7ad92e79af 100644
|
|
|
f93050 |
--- a/vendor/github.com/docker/docker/api/types/filters/parse.go
|
|
|
f93050 |
+++ b/vendor/github.com/docker/docker/api/types/filters/parse.go
|
|
|
f93050 |
@@ -36,6 +36,15 @@ func NewArgs(initialArgs ...KeyValuePair) Args {
|
|
|
f93050 |
return args
|
|
|
f93050 |
}
|
|
|
f93050 |
|
|
|
f93050 |
+// Keys returns all the keys in list of Args
|
|
|
f93050 |
+func (args Args) Keys() []string {
|
|
|
f93050 |
+ keys := make([]string, 0, len(args.fields))
|
|
|
f93050 |
+ for k := range args.fields {
|
|
|
f93050 |
+ keys = append(keys, k)
|
|
|
f93050 |
+ }
|
|
|
f93050 |
+ return keys
|
|
|
f93050 |
+}
|
|
|
f93050 |
+
|
|
|
f93050 |
// MarshalJSON returns a JSON byte representation of the Args
|
|
|
f93050 |
func (args Args) MarshalJSON() ([]byte, error) {
|
|
|
f93050 |
if len(args.fields) == 0 {
|
|
|
f93050 |
diff --git a/vendor/github.com/docker/docker/api/types/swarm/service.go b/vendor/github.com/docker/docker/api/types/swarm/service.go
|
|
|
f93050 |
index abf192e75941..6b59711ab25a 100644
|
|
|
f93050 |
--- a/vendor/github.com/docker/docker/api/types/swarm/service.go
|
|
|
f93050 |
+++ b/vendor/github.com/docker/docker/api/types/swarm/service.go
|
|
|
f93050 |
@@ -10,6 +10,13 @@ type Service struct {
|
|
|
f93050 |
PreviousSpec *ServiceSpec `json:",omitempty"`
|
|
|
f93050 |
Endpoint Endpoint `json:",omitempty"`
|
|
|
f93050 |
UpdateStatus *UpdateStatus `json:",omitempty"`
|
|
|
f93050 |
+
|
|
|
f93050 |
+ // ServiceStatus is an optional, extra field indicating the number of
|
|
|
f93050 |
+ // desired and running tasks. It is provided primarily as a shortcut to
|
|
|
f93050 |
+ // calculating these values client-side, which otherwise would require
|
|
|
f93050 |
+ // listing all tasks for a service, an operation that could be
|
|
|
f93050 |
+ // computation and network expensive.
|
|
|
f93050 |
+ ServiceStatus *ServiceStatus `json:",omitempty"`
|
|
|
f93050 |
}
|
|
|
f93050 |
|
|
|
f93050 |
// ServiceSpec represents the spec of a service.
|
|
|
f93050 |
@@ -122,3 +129,17 @@ type UpdateConfig struct {
|
|
|
f93050 |
// started, or the new task is started before the old task is shut down.
|
|
|
f93050 |
Order string
|
|
|
f93050 |
}
|
|
|
f93050 |
+
|
|
|
f93050 |
+// ServiceStatus represents the number of running tasks in a service and the
|
|
|
f93050 |
+// number of tasks desired to be running.
|
|
|
f93050 |
+type ServiceStatus struct {
|
|
|
f93050 |
+ // RunningTasks is the number of tasks for the service actually in the
|
|
|
f93050 |
+ // Running state
|
|
|
f93050 |
+ RunningTasks uint64
|
|
|
f93050 |
+
|
|
|
f93050 |
+ // DesiredTasks is the number of tasks desired to be running by the
|
|
|
f93050 |
+ // service. For replicated services, this is the replica count. For global
|
|
|
f93050 |
+ // services, this is computed by taking the number of tasks with desired
|
|
|
f93050 |
+ // state of not-Shutdown.
|
|
|
f93050 |
+ DesiredTasks uint64
|
|
|
f93050 |
+}
|
|
|
f93050 |
diff --git a/vendor/github.com/docker/docker/client/container_list.go b/vendor/github.com/docker/docker/client/container_list.go
|
|
|
f93050 |
index c099d80e2a24..a973de597fdf 100644
|
|
|
f93050 |
--- a/vendor/github.com/docker/docker/client/container_list.go
|
|
|
f93050 |
+++ b/vendor/github.com/docker/docker/client/container_list.go
|
|
|
f93050 |
@@ -35,7 +35,7 @@ func (cli *Client) ContainerList(ctx context.Context, options types.ContainerLis
|
|
|
f93050 |
}
|
|
|
f93050 |
|
|
|
f93050 |
if options.Filters.Len() > 0 {
|
|
|
f93050 |
- //lint:ignore SA1019 for old code
|
|
|
f93050 |
+ //nolint:staticcheck // ignore SA1019 for old code
|
|
|
f93050 |
filterJSON, err := filters.ToParamWithVersion(cli.version, options.Filters)
|
|
|
f93050 |
|
|
|
f93050 |
if err != nil {
|
|
|
f93050 |
diff --git a/vendor/github.com/docker/docker/client/events.go b/vendor/github.com/docker/docker/client/events.go
|
|
|
f93050 |
index f347cadf1450..f0dc9d9e12f3 100644
|
|
|
f93050 |
--- a/vendor/github.com/docker/docker/client/events.go
|
|
|
f93050 |
+++ b/vendor/github.com/docker/docker/client/events.go
|
|
|
f93050 |
@@ -90,7 +90,7 @@ func buildEventsQueryParams(cliVersion string, options types.EventsOptions) (url
|
|
|
f93050 |
}
|
|
|
f93050 |
|
|
|
f93050 |
if options.Filters.Len() > 0 {
|
|
|
f93050 |
- //lint:ignore SA1019 for old code
|
|
|
f93050 |
+ //nolint:staticcheck // ignore SA1019 for old code
|
|
|
f93050 |
filterJSON, err := filters.ToParamWithVersion(cliVersion, options.Filters)
|
|
|
f93050 |
if err != nil {
|
|
|
f93050 |
return nil, err
|
|
|
f93050 |
diff --git a/vendor/github.com/docker/docker/client/hijack.go b/vendor/github.com/docker/docker/client/hijack.go
|
|
|
f93050 |
index e77084af64d7..e1dc49ef0f66 100644
|
|
|
f93050 |
--- a/vendor/github.com/docker/docker/client/hijack.go
|
|
|
f93050 |
+++ b/vendor/github.com/docker/docker/client/hijack.go
|
|
|
f93050 |
@@ -24,7 +24,7 @@ func (cli *Client) postHijacked(ctx context.Context, path string, query url.Valu
|
|
|
f93050 |
}
|
|
|
f93050 |
|
|
|
f93050 |
apiPath := cli.getAPIPath(ctx, path, query)
|
|
|
f93050 |
- req, err := http.NewRequest("POST", apiPath, bodyEncoded)
|
|
|
f93050 |
+ req, err := http.NewRequest(http.MethodPost, apiPath, bodyEncoded)
|
|
|
f93050 |
if err != nil {
|
|
|
f93050 |
return types.HijackedResponse{}, err
|
|
|
f93050 |
}
|
|
|
f93050 |
@@ -40,7 +40,7 @@ func (cli *Client) postHijacked(ctx context.Context, path string, query url.Valu
|
|
|
f93050 |
|
|
|
f93050 |
// DialHijack returns a hijacked connection with negotiated protocol proto.
|
|
|
f93050 |
func (cli *Client) DialHijack(ctx context.Context, url, proto string, meta map[string][]string) (net.Conn, error) {
|
|
|
f93050 |
- req, err := http.NewRequest("POST", url, nil)
|
|
|
f93050 |
+ req, err := http.NewRequest(http.MethodPost, url, nil)
|
|
|
f93050 |
if err != nil {
|
|
|
f93050 |
return nil, err
|
|
|
f93050 |
}
|
|
|
f93050 |
@@ -88,7 +88,7 @@ func (cli *Client) setupHijackConn(ctx context.Context, req *http.Request, proto
|
|
|
f93050 |
// Server hijacks the connection, error 'connection closed' expected
|
|
|
f93050 |
resp, err := clientconn.Do(req)
|
|
|
f93050 |
|
|
|
f93050 |
- //lint:ignore SA1019 for connecting to old (pre go1.8) daemons
|
|
|
f93050 |
+ //nolint:staticcheck // ignore SA1019 for connecting to old (pre go1.8) daemons
|
|
|
f93050 |
if err != httputil.ErrPersistEOF {
|
|
|
f93050 |
if err != nil {
|
|
|
f93050 |
return nil, err
|
|
|
f93050 |
diff --git a/vendor/github.com/docker/docker/client/image_list.go b/vendor/github.com/docker/docker/client/image_list.go
|
|
|
f93050 |
index a5bc4b095f7b..a4d7505094cd 100644
|
|
|
f93050 |
--- a/vendor/github.com/docker/docker/client/image_list.go
|
|
|
f93050 |
+++ b/vendor/github.com/docker/docker/client/image_list.go
|
|
|
f93050 |
@@ -24,7 +24,7 @@ func (cli *Client) ImageList(ctx context.Context, options types.ImageListOptions
|
|
|
f93050 |
}
|
|
|
f93050 |
}
|
|
|
f93050 |
if optionFilters.Len() > 0 {
|
|
|
f93050 |
- //lint:ignore SA1019 for old code
|
|
|
f93050 |
+ //nolint:staticcheck // ignore SA1019 for old code
|
|
|
f93050 |
filterJSON, err := filters.ToParamWithVersion(cli.version, optionFilters)
|
|
|
f93050 |
if err != nil {
|
|
|
f93050 |
return images, err
|
|
|
f93050 |
diff --git a/vendor/github.com/docker/docker/client/network_list.go b/vendor/github.com/docker/docker/client/network_list.go
|
|
|
f93050 |
index 8ca7eb6128e6..ed2acb55711d 100644
|
|
|
f93050 |
--- a/vendor/github.com/docker/docker/client/network_list.go
|
|
|
f93050 |
+++ b/vendor/github.com/docker/docker/client/network_list.go
|
|
|
f93050 |
@@ -13,7 +13,7 @@ import (
|
|
|
f93050 |
func (cli *Client) NetworkList(ctx context.Context, options types.NetworkListOptions) ([]types.NetworkResource, error) {
|
|
|
f93050 |
query := url.Values{}
|
|
|
f93050 |
if options.Filters.Len() > 0 {
|
|
|
f93050 |
- //lint:ignore SA1019 for old code
|
|
|
f93050 |
+ //nolint:staticcheck // ignore SA1019 for old code
|
|
|
f93050 |
filterJSON, err := filters.ToParamWithVersion(cli.version, options.Filters)
|
|
|
f93050 |
if err != nil {
|
|
|
f93050 |
return nil, err
|
|
|
f93050 |
diff --git a/vendor/github.com/docker/docker/client/ping.go b/vendor/github.com/docker/docker/client/ping.go
|
|
|
f93050 |
index 90f39ec14f92..1cfc48a25d27 100644
|
|
|
f93050 |
--- a/vendor/github.com/docker/docker/client/ping.go
|
|
|
f93050 |
+++ b/vendor/github.com/docker/docker/client/ping.go
|
|
|
f93050 |
@@ -19,7 +19,7 @@ func (cli *Client) Ping(ctx context.Context) (types.Ping, error) {
|
|
|
f93050 |
// Using cli.buildRequest() + cli.doRequest() instead of cli.sendRequest()
|
|
|
f93050 |
// because ping requests are used during API version negotiation, so we want
|
|
|
f93050 |
// to hit the non-versioned /_ping endpoint, not /v1.xx/_ping
|
|
|
f93050 |
- req, err := cli.buildRequest("HEAD", path.Join(cli.basePath, "/_ping"), nil, nil)
|
|
|
f93050 |
+ req, err := cli.buildRequest(http.MethodHead, path.Join(cli.basePath, "/_ping"), nil, nil)
|
|
|
f93050 |
if err != nil {
|
|
|
f93050 |
return ping, err
|
|
|
f93050 |
}
|
|
|
f93050 |
@@ -35,7 +35,7 @@ func (cli *Client) Ping(ctx context.Context) (types.Ping, error) {
|
|
|
f93050 |
return ping, err
|
|
|
f93050 |
}
|
|
|
f93050 |
|
|
|
f93050 |
- req, err = cli.buildRequest("GET", path.Join(cli.basePath, "/_ping"), nil, nil)
|
|
|
f93050 |
+ req, err = cli.buildRequest(http.MethodGet, path.Join(cli.basePath, "/_ping"), nil, nil)
|
|
|
f93050 |
if err != nil {
|
|
|
f93050 |
return ping, err
|
|
|
f93050 |
}
|
|
|
f93050 |
diff --git a/vendor/github.com/docker/docker/client/plugin_list.go b/vendor/github.com/docker/docker/client/plugin_list.go
|
|
|
f93050 |
index a51c930e6d53..cf1935e2f5ee 100644
|
|
|
f93050 |
--- a/vendor/github.com/docker/docker/client/plugin_list.go
|
|
|
f93050 |
+++ b/vendor/github.com/docker/docker/client/plugin_list.go
|
|
|
f93050 |
@@ -15,7 +15,7 @@ func (cli *Client) PluginList(ctx context.Context, filter filters.Args) (types.P
|
|
|
f93050 |
query := url.Values{}
|
|
|
f93050 |
|
|
|
f93050 |
if filter.Len() > 0 {
|
|
|
f93050 |
- //lint:ignore SA1019 for old code
|
|
|
f93050 |
+ //nolint:staticcheck // ignore SA1019 for old code
|
|
|
f93050 |
filterJSON, err := filters.ToParamWithVersion(cli.version, filter)
|
|
|
f93050 |
if err != nil {
|
|
|
f93050 |
return plugins, err
|
|
|
f93050 |
diff --git a/vendor/github.com/docker/docker/client/request.go b/vendor/github.com/docker/docker/client/request.go
|
|
|
f93050 |
index 144c4163695d..ee15a46ed09b 100644
|
|
|
f93050 |
--- a/vendor/github.com/docker/docker/client/request.go
|
|
|
f93050 |
+++ b/vendor/github.com/docker/docker/client/request.go
|
|
|
f93050 |
@@ -29,12 +29,12 @@ type serverResponse struct {
|
|
|
f93050 |
|
|
|
f93050 |
// head sends an http request to the docker API using the method HEAD.
|
|
|
f93050 |
func (cli *Client) head(ctx context.Context, path string, query url.Values, headers map[string][]string) (serverResponse, error) {
|
|
|
f93050 |
- return cli.sendRequest(ctx, "HEAD", path, query, nil, headers)
|
|
|
f93050 |
+ return cli.sendRequest(ctx, http.MethodHead, path, query, nil, headers)
|
|
|
f93050 |
}
|
|
|
f93050 |
|
|
|
f93050 |
// get sends an http request to the docker API using the method GET with a specific Go context.
|
|
|
f93050 |
func (cli *Client) get(ctx context.Context, path string, query url.Values, headers map[string][]string) (serverResponse, error) {
|
|
|
f93050 |
- return cli.sendRequest(ctx, "GET", path, query, nil, headers)
|
|
|
f93050 |
+ return cli.sendRequest(ctx, http.MethodGet, path, query, nil, headers)
|
|
|
f93050 |
}
|
|
|
f93050 |
|
|
|
f93050 |
// post sends an http request to the docker API using the method POST with a specific Go context.
|
|
|
f93050 |
@@ -43,21 +43,21 @@ func (cli *Client) post(ctx context.Context, path string, query url.Values, obj
|
|
|
f93050 |
if err != nil {
|
|
|
f93050 |
return serverResponse{}, err
|
|
|
f93050 |
}
|
|
|
f93050 |
- return cli.sendRequest(ctx, "POST", path, query, body, headers)
|
|
|
f93050 |
+ return cli.sendRequest(ctx, http.MethodPost, path, query, body, headers)
|
|
|
f93050 |
}
|
|
|
f93050 |
|
|
|
f93050 |
func (cli *Client) postRaw(ctx context.Context, path string, query url.Values, body io.Reader, headers map[string][]string) (serverResponse, error) {
|
|
|
f93050 |
- return cli.sendRequest(ctx, "POST", path, query, body, headers)
|
|
|
f93050 |
+ return cli.sendRequest(ctx, http.MethodPost, path, query, body, headers)
|
|
|
f93050 |
}
|
|
|
f93050 |
|
|
|
f93050 |
// putRaw sends an http request to the docker API using the method PUT.
|
|
|
f93050 |
func (cli *Client) putRaw(ctx context.Context, path string, query url.Values, body io.Reader, headers map[string][]string) (serverResponse, error) {
|
|
|
f93050 |
- return cli.sendRequest(ctx, "PUT", path, query, body, headers)
|
|
|
f93050 |
+ return cli.sendRequest(ctx, http.MethodPut, path, query, body, headers)
|
|
|
f93050 |
}
|
|
|
f93050 |
|
|
|
f93050 |
// delete sends an http request to the docker API using the method DELETE.
|
|
|
f93050 |
func (cli *Client) delete(ctx context.Context, path string, query url.Values, headers map[string][]string) (serverResponse, error) {
|
|
|
f93050 |
- return cli.sendRequest(ctx, "DELETE", path, query, nil, headers)
|
|
|
f93050 |
+ return cli.sendRequest(ctx, http.MethodDelete, path, query, nil, headers)
|
|
|
f93050 |
}
|
|
|
f93050 |
|
|
|
f93050 |
type headers map[string][]string
|
|
|
f93050 |
@@ -79,7 +79,7 @@ func encodeBody(obj interface{}, headers headers) (io.Reader, headers, error) {
|
|
|
f93050 |
}
|
|
|
f93050 |
|
|
|
f93050 |
func (cli *Client) buildRequest(method, path string, body io.Reader, headers headers) (*http.Request, error) {
|
|
|
f93050 |
- expectedPayload := (method == "POST" || method == "PUT")
|
|
|
f93050 |
+ expectedPayload := (method == http.MethodPost || method == http.MethodPut)
|
|
|
f93050 |
if expectedPayload && body == nil {
|
|
|
f93050 |
body = bytes.NewReader([]byte{})
|
|
|
f93050 |
}
|
|
|
f93050 |
diff --git a/vendor/github.com/docker/docker/client/service_list.go b/vendor/github.com/docker/docker/client/service_list.go
|
|
|
f93050 |
index 64d35e715982..f97ec75a5cb7 100644
|
|
|
f93050 |
--- a/vendor/github.com/docker/docker/client/service_list.go
|
|
|
f93050 |
+++ b/vendor/github.com/docker/docker/client/service_list.go
|
|
|
f93050 |
@@ -23,6 +23,10 @@ func (cli *Client) ServiceList(ctx context.Context, options types.ServiceListOpt
|
|
|
f93050 |
query.Set("filters", filterJSON)
|
|
|
f93050 |
}
|
|
|
f93050 |
|
|
|
f93050 |
+ if options.Status {
|
|
|
f93050 |
+ query.Set("status", "true")
|
|
|
f93050 |
+ }
|
|
|
f93050 |
+
|
|
|
f93050 |
resp, err := cli.get(ctx, "/services", query, nil)
|
|
|
f93050 |
defer ensureReaderClosed(resp)
|
|
|
f93050 |
if err != nil {
|
|
|
f93050 |
diff --git a/vendor/github.com/docker/docker/client/volume_list.go b/vendor/github.com/docker/docker/client/volume_list.go
|
|
|
f93050 |
index d68fc2b9860d..942498dde2c7 100644
|
|
|
f93050 |
--- a/vendor/github.com/docker/docker/client/volume_list.go
|
|
|
f93050 |
+++ b/vendor/github.com/docker/docker/client/volume_list.go
|
|
|
f93050 |
@@ -15,7 +15,7 @@ func (cli *Client) VolumeList(ctx context.Context, filter filters.Args) (volumet
|
|
|
f93050 |
query := url.Values{}
|
|
|
f93050 |
|
|
|
f93050 |
if filter.Len() > 0 {
|
|
|
f93050 |
- //lint:ignore SA1019 for old code
|
|
|
f93050 |
+ //nolint:staticcheck // ignore SA1019 for old code
|
|
|
f93050 |
filterJSON, err := filters.ToParamWithVersion(cli.version, filter)
|
|
|
f93050 |
if err != nil {
|
|
|
f93050 |
return volumes, err
|
|
|
f93050 |
diff --git a/vendor/github.com/docker/docker/pkg/homedir/homedir_unix.go b/vendor/github.com/docker/docker/pkg/homedir/homedir_unix.go
|
|
|
f93050 |
index 284e8be7ca83..441bd727b602 100644
|
|
|
f93050 |
--- a/vendor/github.com/docker/docker/pkg/homedir/homedir_unix.go
|
|
|
f93050 |
+++ b/vendor/github.com/docker/docker/pkg/homedir/homedir_unix.go
|
|
|
f93050 |
@@ -16,8 +16,11 @@ func Key() string {
|
|
|
f93050 |
// Get returns the home directory of the current user with the help of
|
|
|
f93050 |
// environment variables depending on the target operating system.
|
|
|
f93050 |
// Returned path should be used with "path/filepath" to form new paths.
|
|
|
f93050 |
-// If compiling statically, ensure the osusergo build tag is used.
|
|
|
f93050 |
-// If needing to do nss lookups, do not compile statically.
|
|
|
f93050 |
+//
|
|
|
f93050 |
+// If linking statically with cgo enabled against glibc, ensure the
|
|
|
f93050 |
+// osusergo build tag is used.
|
|
|
f93050 |
+//
|
|
|
f93050 |
+// If needing to do nss lookups, do not disable cgo or set osusergo.
|
|
|
f93050 |
func Get() string {
|
|
|
f93050 |
home := os.Getenv(Key())
|
|
|
f93050 |
if home == "" {
|
|
|
f93050 |
diff --git a/vendor/github.com/docker/docker/pkg/jsonmessage/jsonmessage.go b/vendor/github.com/docker/docker/pkg/jsonmessage/jsonmessage.go
|
|
|
f93050 |
index 6d66408984ff..814993ec36df 100644
|
|
|
f93050 |
--- a/vendor/github.com/docker/docker/pkg/jsonmessage/jsonmessage.go
|
|
|
f93050 |
+++ b/vendor/github.com/docker/docker/pkg/jsonmessage/jsonmessage.go
|
|
|
f93050 |
@@ -139,13 +139,13 @@ type JSONMessage struct {
|
|
|
f93050 |
Stream string `json:"stream,omitempty"`
|
|
|
f93050 |
Status string `json:"status,omitempty"`
|
|
|
f93050 |
Progress *JSONProgress `json:"progressDetail,omitempty"`
|
|
|
f93050 |
- ProgressMessage string `json:"progress,omitempty"` //deprecated
|
|
|
f93050 |
+ ProgressMessage string `json:"progress,omitempty"` // deprecated
|
|
|
f93050 |
ID string `json:"id,omitempty"`
|
|
|
f93050 |
From string `json:"from,omitempty"`
|
|
|
f93050 |
Time int64 `json:"time,omitempty"`
|
|
|
f93050 |
TimeNano int64 `json:"timeNano,omitempty"`
|
|
|
f93050 |
Error *JSONError `json:"errorDetail,omitempty"`
|
|
|
f93050 |
- ErrorMessage string `json:"error,omitempty"` //deprecated
|
|
|
f93050 |
+ ErrorMessage string `json:"error,omitempty"` // deprecated
|
|
|
f93050 |
// Aux contains out-of-band data, such as digests for push signing and image id after building.
|
|
|
f93050 |
Aux *json.RawMessage `json:"aux,omitempty"`
|
|
|
f93050 |
}
|
|
|
f93050 |
@@ -177,7 +177,7 @@ func (jm *JSONMessage) Display(out io.Writer, isTerminal bool) error {
|
|
|
f93050 |
if isTerminal && jm.Stream == "" && jm.Progress != nil {
|
|
|
f93050 |
clearLine(out)
|
|
|
f93050 |
endl = "\r"
|
|
|
f93050 |
- fmt.Fprintf(out, endl)
|
|
|
f93050 |
+ fmt.Fprint(out, endl)
|
|
|
f93050 |
} else if jm.Progress != nil && jm.Progress.String() != "" { //disable progressbar in non-terminal
|
|
|
f93050 |
return nil
|
|
|
f93050 |
}
|
|
|
f93050 |
@@ -194,7 +194,7 @@ func (jm *JSONMessage) Display(out io.Writer, isTerminal bool) error {
|
|
|
f93050 |
}
|
|
|
f93050 |
if jm.Progress != nil && isTerminal {
|
|
|
f93050 |
fmt.Fprintf(out, "%s %s%s", jm.Status, jm.Progress.String(), endl)
|
|
|
f93050 |
- } else if jm.ProgressMessage != "" { //deprecated
|
|
|
f93050 |
+ } else if jm.ProgressMessage != "" { // deprecated
|
|
|
f93050 |
fmt.Fprintf(out, "%s %s%s", jm.Status, jm.ProgressMessage, endl)
|
|
|
f93050 |
} else if jm.Stream != "" {
|
|
|
f93050 |
fmt.Fprintf(out, "%s%s", jm.Stream, endl)
|
|
|
f93050 |
diff --git a/vendor/github.com/docker/docker/pkg/mount/mountinfo_linux.go b/vendor/github.com/docker/docker/pkg/mount/mountinfo_linux.go
|
|
|
f93050 |
index fe6e3ddba132..58ca61f3f7c4 100644
|
|
|
f93050 |
--- a/vendor/github.com/docker/docker/pkg/mount/mountinfo_linux.go
|
|
|
f93050 |
+++ b/vendor/github.com/docker/docker/pkg/mount/mountinfo_linux.go
|
|
|
f93050 |
@@ -90,7 +90,6 @@ func parseInfoFile(r io.Reader, filter FilterFunc) ([]*Info, error) {
|
|
|
f93050 |
mount propagation flags in fields[6]. The correct
|
|
|
f93050 |
behavior is to ignore any unknown optional fields.
|
|
|
f93050 |
*/
|
|
|
f93050 |
- break
|
|
|
f93050 |
}
|
|
|
f93050 |
}
|
|
|
f93050 |
if i == numFields {
|
|
|
f93050 |
diff --git a/vendor/github.com/docker/docker/pkg/namesgenerator/names-generator.go b/vendor/github.com/docker/docker/pkg/namesgenerator/names-generator.go
|
|
|
f93050 |
index f3f46055ef3e..3c42cff5e335 100644
|
|
|
f93050 |
--- a/vendor/github.com/docker/docker/pkg/namesgenerator/names-generator.go
|
|
|
f93050 |
+++ b/vendor/github.com/docker/docker/pkg/namesgenerator/names-generator.go
|
|
|
f93050 |
@@ -153,7 +153,7 @@ var (
|
|
|
f93050 |
// Stefan Banach - Polish mathematician, was one of the founders of modern functional analysis. https://en.wikipedia.org/wiki/Stefan_Banach
|
|
|
f93050 |
"banach",
|
|
|
f93050 |
|
|
|
f93050 |
- // Buckaroo Banzai and his mentor Dr. Hikita perfectd the "oscillation overthruster", a device that allows one to pass through solid matter. - https://en.wikipedia.org/wiki/The_Adventures_of_Buckaroo_Banzai_Across_the_8th_Dimension
|
|
|
f93050 |
+ // Buckaroo Banzai and his mentor Dr. Hikita perfected the "oscillation overthruster", a device that allows one to pass through solid matter. - https://en.wikipedia.org/wiki/The_Adventures_of_Buckaroo_Banzai_Across_the_8th_Dimension
|
|
|
f93050 |
"banzai",
|
|
|
f93050 |
|
|
|
f93050 |
// John Bardeen co-invented the transistor - https://en.wikipedia.org/wiki/John_Bardeen
|
|
|
f93050 |
diff --git a/vendor/github.com/docker/docker/pkg/pools/pools.go b/vendor/github.com/docker/docker/pkg/pools/pools.go
|
|
|
f93050 |
index 3b978fd3b583..3792c67a9e45 100644
|
|
|
f93050 |
--- a/vendor/github.com/docker/docker/pkg/pools/pools.go
|
|
|
f93050 |
+++ b/vendor/github.com/docker/docker/pkg/pools/pools.go
|
|
|
f93050 |
@@ -62,24 +62,23 @@ type bufferPool struct {
|
|
|
f93050 |
func newBufferPoolWithSize(size int) *bufferPool {
|
|
|
f93050 |
return &bufferPool{
|
|
|
f93050 |
pool: sync.Pool{
|
|
|
f93050 |
- New: func() interface{} { return make([]byte, size) },
|
|
|
f93050 |
+ New: func() interface{} { s := make([]byte, size); return &s },
|
|
|
f93050 |
},
|
|
|
f93050 |
}
|
|
|
f93050 |
}
|
|
|
f93050 |
|
|
|
f93050 |
-func (bp *bufferPool) Get() []byte {
|
|
|
f93050 |
- return bp.pool.Get().([]byte)
|
|
|
f93050 |
+func (bp *bufferPool) Get() *[]byte {
|
|
|
f93050 |
+ return bp.pool.Get().(*[]byte)
|
|
|
f93050 |
}
|
|
|
f93050 |
|
|
|
f93050 |
-func (bp *bufferPool) Put(b []byte) {
|
|
|
f93050 |
- //nolint:staticcheck // TODO changing this to a pointer makes tests fail. Investigate if we should change or not (otherwise remove this TODO)
|
|
|
f93050 |
+func (bp *bufferPool) Put(b *[]byte) {
|
|
|
f93050 |
bp.pool.Put(b)
|
|
|
f93050 |
}
|
|
|
f93050 |
|
|
|
f93050 |
// Copy is a convenience wrapper which uses a buffer to avoid allocation in io.Copy.
|
|
|
f93050 |
func Copy(dst io.Writer, src io.Reader) (written int64, err error) {
|
|
|
f93050 |
buf := buffer32KPool.Get()
|
|
|
f93050 |
- written, err = io.CopyBuffer(dst, src, buf)
|
|
|
f93050 |
+ written, err = io.CopyBuffer(dst, src, *buf)
|
|
|
f93050 |
buffer32KPool.Put(buf)
|
|
|
f93050 |
return
|
|
|
f93050 |
}
|
|
|
f93050 |
diff --git a/vendor/github.com/docker/docker/pkg/system/init_windows.go b/vendor/github.com/docker/docker/pkg/system/init_windows.go
|
|
|
f93050 |
index f303aa906392..7e4ac55d76da 100644
|
|
|
f93050 |
--- a/vendor/github.com/docker/docker/pkg/system/init_windows.go
|
|
|
f93050 |
+++ b/vendor/github.com/docker/docker/pkg/system/init_windows.go
|
|
|
f93050 |
@@ -18,8 +18,7 @@ var (
|
|
|
f93050 |
|
|
|
f93050 |
// InitLCOW sets whether LCOW is supported or not. Requires RS5+
|
|
|
f93050 |
func InitLCOW(experimental bool) {
|
|
|
f93050 |
- v := GetOSVersion()
|
|
|
f93050 |
- if experimental && v.Build >= osversion.RS5 {
|
|
|
f93050 |
+ if experimental && osversion.Build() >= osversion.RS5 {
|
|
|
f93050 |
lcowSupported = true
|
|
|
f93050 |
}
|
|
|
f93050 |
}
|
|
|
f93050 |
diff --git a/vendor/github.com/docker/docker/pkg/system/syscall_windows.go b/vendor/github.com/docker/docker/pkg/system/syscall_windows.go
|
|
|
f93050 |
index eb19f9c850cd..67bec7e30b1b 100644
|
|
|
f93050 |
--- a/vendor/github.com/docker/docker/pkg/system/syscall_windows.go
|
|
|
f93050 |
+++ b/vendor/github.com/docker/docker/pkg/system/syscall_windows.go
|
|
|
f93050 |
@@ -5,6 +5,7 @@ import (
|
|
|
f93050 |
"syscall"
|
|
|
f93050 |
"unsafe"
|
|
|
f93050 |
|
|
|
f93050 |
+ "github.com/Microsoft/hcsshim/osversion"
|
|
|
f93050 |
"github.com/sirupsen/logrus"
|
|
|
f93050 |
"golang.org/x/sys/windows"
|
|
|
f93050 |
)
|
|
|
f93050 |
@@ -61,12 +62,7 @@ var (
|
|
|
f93050 |
|
|
|
f93050 |
// OSVersion is a wrapper for Windows version information
|
|
|
f93050 |
// https://msdn.microsoft.com/en-us/library/windows/desktop/ms724439(v=vs.85).aspx
|
|
|
f93050 |
-type OSVersion struct {
|
|
|
f93050 |
- Version uint32
|
|
|
f93050 |
- MajorVersion uint8
|
|
|
f93050 |
- MinorVersion uint8
|
|
|
f93050 |
- Build uint16
|
|
|
f93050 |
-}
|
|
|
f93050 |
+type OSVersion osversion.OSVersion
|
|
|
f93050 |
|
|
|
f93050 |
// https://msdn.microsoft.com/en-us/library/windows/desktop/ms724833(v=vs.85).aspx
|
|
|
f93050 |
type osVersionInfoEx struct {
|
|
|
f93050 |
@@ -85,18 +81,9 @@ type osVersionInfoEx struct {
|
|
|
f93050 |
|
|
|
f93050 |
// GetOSVersion gets the operating system version on Windows. Note that
|
|
|
f93050 |
// dockerd.exe must be manifested to get the correct version information.
|
|
|
f93050 |
+// Deprecated: use github.com/Microsoft/hcsshim/osversion.Get() instead
|
|
|
f93050 |
func GetOSVersion() OSVersion {
|
|
|
f93050 |
- var err error
|
|
|
f93050 |
- osv := OSVersion{}
|
|
|
f93050 |
- osv.Version, err = windows.GetVersion()
|
|
|
f93050 |
- if err != nil {
|
|
|
f93050 |
- // GetVersion never fails.
|
|
|
f93050 |
- panic(err)
|
|
|
f93050 |
- }
|
|
|
f93050 |
- osv.MajorVersion = uint8(osv.Version & 0xFF)
|
|
|
f93050 |
- osv.MinorVersion = uint8(osv.Version >> 8 & 0xFF)
|
|
|
f93050 |
- osv.Build = uint16(osv.Version >> 16)
|
|
|
f93050 |
- return osv
|
|
|
f93050 |
+ return OSVersion(osversion.Get())
|
|
|
f93050 |
}
|
|
|
f93050 |
|
|
|
f93050 |
func (osv OSVersion) ToString() string {
|
|
|
f93050 |
diff --git a/vendor/github.com/fsouza/go-dockerclient/Makefile b/vendor/github.com/fsouza/go-dockerclient/Makefile
|
|
|
f93050 |
index e0880ff67b9e..84e1bfaba0ac 100644
|
|
|
f93050 |
--- a/vendor/github.com/fsouza/go-dockerclient/Makefile
|
|
|
f93050 |
+++ b/vendor/github.com/fsouza/go-dockerclient/Makefile
|
|
|
f93050 |
@@ -1,7 +1,6 @@
|
|
|
f93050 |
.PHONY: \
|
|
|
f93050 |
all \
|
|
|
f93050 |
lint \
|
|
|
f93050 |
- fmt \
|
|
|
f93050 |
pretest \
|
|
|
f93050 |
test \
|
|
|
f93050 |
integration
|
|
|
f93050 |
@@ -12,10 +11,6 @@ lint:
|
|
|
f93050 |
cd /tmp && GO111MODULE=on go get github.com/golangci/golangci-lint/cmd/golangci-lint@latest
|
|
|
f93050 |
golangci-lint run
|
|
|
f93050 |
|
|
|
f93050 |
-fmt:
|
|
|
f93050 |
- GO111MODULE=off go get mvdan.cc/gofumpt
|
|
|
f93050 |
- gofumpt -s -w .
|
|
|
f93050 |
-
|
|
|
f93050 |
pretest: lint
|
|
|
f93050 |
|
|
|
f93050 |
gotest:
|
|
|
f93050 |
diff --git a/vendor/github.com/fsouza/go-dockerclient/README.md b/vendor/github.com/fsouza/go-dockerclient/README.md
|
|
|
f93050 |
index b7af7d0b9f2d..f4ad8ca622f8 100644
|
|
|
f93050 |
--- a/vendor/github.com/fsouza/go-dockerclient/README.md
|
|
|
f93050 |
+++ b/vendor/github.com/fsouza/go-dockerclient/README.md
|
|
|
f93050 |
@@ -18,10 +18,10 @@ documentation](https://docs.docker.com/engine/api/latest/).
|
|
|
f93050 |
Link for the official SDK: https://docs.docker.com/develop/sdk/
|
|
|
f93050 |
|
|
|
f93050 |
go-dockerclient was created before Docker had an official Go SDK and is
|
|
|
f93050 |
-still maintained and relatively active because it's still used out there. New
|
|
|
f93050 |
-features in the Docker API do not get automatically implemented here: it's
|
|
|
f93050 |
-based on demand, if someone wants it, they can file an issue or a PR and the
|
|
|
f93050 |
-feature may get implemented/merged.
|
|
|
f93050 |
+still maintained and active because it's still used out there. New features in
|
|
|
f93050 |
+the Docker API do not get automatically implemented here: it's based on demand,
|
|
|
f93050 |
+if someone wants it, they can file an issue or a PR and the feature may get
|
|
|
f93050 |
+implemented/merged.
|
|
|
f93050 |
|
|
|
f93050 |
For new projects, using the official SDK is probably more appropriate as
|
|
|
f93050 |
go-dockerclient lags behind the official SDK.
|
|
|
f93050 |
@@ -105,7 +105,10 @@ import (
|
|
|
f93050 |
)
|
|
|
f93050 |
|
|
|
f93050 |
func main() {
|
|
|
f93050 |
- client, _ := docker.NewClientFromEnv()
|
|
|
f93050 |
+ client, err := docker.NewClientFromEnv()
|
|
|
f93050 |
+ if err != nil {
|
|
|
f93050 |
+ // handle err
|
|
|
f93050 |
+ }
|
|
|
f93050 |
// use client
|
|
|
f93050 |
}
|
|
|
f93050 |
```
|
|
|
f93050 |
@@ -118,12 +121,11 @@ All development commands can be seen in the [Makefile](Makefile).
|
|
|
f93050 |
|
|
|
f93050 |
Commited code must pass:
|
|
|
f93050 |
|
|
|
f93050 |
-* [golangci-lint](integration_unix_test.go)
|
|
|
f93050 |
-* [gofumpt](https://github.com/mvdan/gofumpt)
|
|
|
f93050 |
+* [golangci-lint](https://github.com/golangci/golangci-lint)
|
|
|
f93050 |
* [go test](https://golang.org/cmd/go/#hdr-Test_packages)
|
|
|
f93050 |
|
|
|
f93050 |
-Running ``make test`` will check all of these. You can reformat the code with
|
|
|
f93050 |
-``make fmt``.
|
|
|
f93050 |
+Running ``make test`` will run all checks, as well as install any required
|
|
|
f93050 |
+dependencies.
|
|
|
f93050 |
|
|
|
f93050 |
## Modules
|
|
|
f93050 |
|
|
|
f93050 |
@@ -133,7 +135,7 @@ If you're using dep, you can check the [releases
|
|
|
f93050 |
page](https://github.com/fsouza/go-dockerclient/releases) for the latest
|
|
|
f93050 |
release fully compatible with dep.
|
|
|
f93050 |
|
|
|
f93050 |
-With other vendoring tools, users might need to specify go-dockerclient's
|
|
|
f93050 |
+With other vendoring tools, users need to specify go-dockerclient's
|
|
|
f93050 |
dependencies manually.
|
|
|
f93050 |
|
|
|
f93050 |
## Using with Docker 1.9 and Go 1.4
|
|
|
f93050 |
diff --git a/vendor/github.com/fsouza/go-dockerclient/appveyor.yml b/vendor/github.com/fsouza/go-dockerclient/appveyor.yml
|
|
|
f93050 |
index d9f374f50aa2..e1574cfc23f7 100644
|
|
|
f93050 |
--- a/vendor/github.com/fsouza/go-dockerclient/appveyor.yml
|
|
|
f93050 |
+++ b/vendor/github.com/fsouza/go-dockerclient/appveyor.yml
|
|
|
f93050 |
@@ -7,8 +7,8 @@ environment:
|
|
|
f93050 |
GOPROXY: https://proxy.golang.org
|
|
|
f93050 |
GO111MODULE: on
|
|
|
f93050 |
matrix:
|
|
|
f93050 |
- - GOVERSION: "1.12.10"
|
|
|
f93050 |
- - GOVERSION: "1.13.1"
|
|
|
f93050 |
+ - GOVERSION: "1.12.13"
|
|
|
f93050 |
+ - GOVERSION: "1.13.4"
|
|
|
f93050 |
install:
|
|
|
f93050 |
- choco install make
|
|
|
f93050 |
- set PATH=%GOPATH%\bin;c:\go\bin;%PATH%
|
|
|
f93050 |
diff --git a/vendor/github.com/fsouza/go-dockerclient/container.go b/vendor/github.com/fsouza/go-dockerclient/container.go
|
|
|
f93050 |
index 0a8ab361cb97..f6bfb59dc99e 100644
|
|
|
f93050 |
--- a/vendor/github.com/fsouza/go-dockerclient/container.go
|
|
|
f93050 |
+++ b/vendor/github.com/fsouza/go-dockerclient/container.go
|
|
|
f93050 |
@@ -546,26 +546,31 @@ func (c *Client) RenameContainer(opts RenameContainerOptions) error {
|
|
|
f93050 |
|
|
|
f93050 |
// InspectContainer returns information about a container by its ID.
|
|
|
f93050 |
//
|
|
|
f93050 |
-// See https://goo.gl/FaI5JT for more details.
|
|
|
f93050 |
+// Deprecated: Use InspectContainerWithOptions instead.
|
|
|
f93050 |
func (c *Client) InspectContainer(id string) (*Container, error) {
|
|
|
f93050 |
- return c.inspectContainer(id, doOptions{})
|
|
|
f93050 |
+ return c.InspectContainerWithOptions(InspectContainerOptions{ID: id})
|
|
|
f93050 |
}
|
|
|
f93050 |
|
|
|
f93050 |
// InspectContainerWithContext returns information about a container by its ID.
|
|
|
f93050 |
// The context object can be used to cancel the inspect request.
|
|
|
f93050 |
//
|
|
|
f93050 |
-// See https://goo.gl/FaI5JT for more details.
|
|
|
f93050 |
+// Deprecated: Use InspectContainerWithOptions instead.
|
|
|
f93050 |
//nolint:golint
|
|
|
f93050 |
func (c *Client) InspectContainerWithContext(id string, ctx context.Context) (*Container, error) {
|
|
|
f93050 |
- return c.inspectContainer(id, doOptions{context: ctx})
|
|
|
f93050 |
+ return c.InspectContainerWithOptions(InspectContainerOptions{ID: id, Context: ctx})
|
|
|
f93050 |
}
|
|
|
f93050 |
|
|
|
f93050 |
-func (c *Client) inspectContainer(id string, opts doOptions) (*Container, error) {
|
|
|
f93050 |
- path := "/containers/" + id + "/json"
|
|
|
f93050 |
- resp, err := c.do(http.MethodGet, path, opts)
|
|
|
f93050 |
+// InspectContainerWithOptions returns information about a container by its ID.
|
|
|
f93050 |
+//
|
|
|
f93050 |
+// See https://goo.gl/FaI5JT for more details.
|
|
|
f93050 |
+func (c *Client) InspectContainerWithOptions(opts InspectContainerOptions) (*Container, error) {
|
|
|
f93050 |
+ path := "/containers/" + opts.ID + "/json?" + queryString(opts)
|
|
|
f93050 |
+ resp, err := c.do(http.MethodGet, path, doOptions{
|
|
|
f93050 |
+ context: opts.Context,
|
|
|
f93050 |
+ })
|
|
|
f93050 |
if err != nil {
|
|
|
f93050 |
if e, ok := err.(*Error); ok && e.Status == http.StatusNotFound {
|
|
|
f93050 |
- return nil, &NoSuchContainer{ID: id}
|
|
|
f93050 |
+ return nil, &NoSuchContainer{ID: opts.ID}
|
|
|
f93050 |
}
|
|
|
f93050 |
return nil, err
|
|
|
f93050 |
}
|
|
|
f93050 |
@@ -577,6 +582,15 @@ func (c *Client) inspectContainer(id string, opts doOptions) (*Container, error)
|
|
|
f93050 |
return &container, nil
|
|
|
f93050 |
}
|
|
|
f93050 |
|
|
|
f93050 |
+// InspectContainerOptions specifies parameters for InspectContainerWithOptions.
|
|
|
f93050 |
+//
|
|
|
f93050 |
+// See https://goo.gl/FaI5JT for more details.
|
|
|
f93050 |
+type InspectContainerOptions struct {
|
|
|
f93050 |
+ Context context.Context
|
|
|
f93050 |
+ ID string `qs:"-"`
|
|
|
f93050 |
+ Size bool
|
|
|
f93050 |
+}
|
|
|
f93050 |
+
|
|
|
f93050 |
// ContainerChanges returns changes in the filesystem of the given container.
|
|
|
f93050 |
//
|
|
|
f93050 |
// See https://goo.gl/15KKzh for more details.
|
|
|
f93050 |
diff --git a/vendor/github.com/fsouza/go-dockerclient/go.mod b/vendor/github.com/fsouza/go-dockerclient/go.mod
|
|
|
f93050 |
index cb0ef690c43f..7bb88972ca82 100644
|
|
|
f93050 |
--- a/vendor/github.com/fsouza/go-dockerclient/go.mod
|
|
|
f93050 |
+++ b/vendor/github.com/fsouza/go-dockerclient/go.mod
|
|
|
f93050 |
@@ -4,16 +4,13 @@ go 1.12
|
|
|
f93050 |
|
|
|
f93050 |
require (
|
|
|
f93050 |
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
|
|
|
f93050 |
- github.com/Microsoft/go-winio v0.4.14
|
|
|
f93050 |
- github.com/Microsoft/hcsshim v0.8.6 // indirect
|
|
|
f93050 |
+ github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5
|
|
|
f93050 |
+ github.com/Microsoft/hcsshim v0.8.7-0.20191101173118-65519b62243c // indirect
|
|
|
f93050 |
github.com/containerd/containerd v1.3.0 // indirect
|
|
|
f93050 |
- github.com/containerd/continuity v0.0.0-20181203112020-004b46473808 // indirect
|
|
|
f93050 |
github.com/docker/distribution v2.7.1+incompatible // indirect
|
|
|
f93050 |
- github.com/docker/docker v1.4.2-0.20190927142053-ada3c14355ce
|
|
|
f93050 |
+ github.com/docker/docker v1.4.2-0.20191101170500-ac7306503d23
|
|
|
f93050 |
github.com/docker/go-connections v0.4.0 // indirect
|
|
|
f93050 |
github.com/docker/go-units v0.4.0
|
|
|
f93050 |
- github.com/gogo/protobuf v1.2.1 // indirect
|
|
|
f93050 |
- github.com/golang/protobuf v1.3.0 // indirect
|
|
|
f93050 |
github.com/google/go-cmp v0.3.1
|
|
|
f93050 |
github.com/gorilla/mux v1.7.3
|
|
|
f93050 |
github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c // indirect
|
|
|
f93050 |
@@ -22,5 +19,4 @@ require (
|
|
|
f93050 |
github.com/opencontainers/runc v0.1.1 // indirect
|
|
|
f93050 |
golang.org/x/crypto v0.0.0-20190927123631-a832865fa7ad
|
|
|
f93050 |
google.golang.org/grpc v1.22.0 // indirect
|
|
|
f93050 |
- gotest.tools v2.2.0+incompatible // indirect
|
|
|
f93050 |
)
|
|
|
f93050 |
diff --git a/vendor/github.com/fsouza/go-dockerclient/go.sum b/vendor/github.com/fsouza/go-dockerclient/go.sum
|
|
|
f93050 |
index c4df2e9569e5..ce78fee7a941 100644
|
|
|
f93050 |
--- a/vendor/github.com/fsouza/go-dockerclient/go.sum
|
|
|
f93050 |
+++ b/vendor/github.com/fsouza/go-dockerclient/go.sum
|
|
|
f93050 |
@@ -2,85 +2,134 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT
|
|
|
f93050 |
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8=
|
|
|
f93050 |
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
|
|
|
f93050 |
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
|
|
|
f93050 |
-github.com/Microsoft/go-winio v0.4.14 h1:+hMXMk01us9KgxGb7ftKQt2Xpf5hH/yky+TDA+qxleU=
|
|
|
f93050 |
-github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
|
|
|
f93050 |
-github.com/Microsoft/hcsshim v0.8.6 h1:ZfF0+zZeYdzMIVMZHKtDKJvLHj76XCuVae/jNkjj0IA=
|
|
|
f93050 |
-github.com/Microsoft/hcsshim v0.8.6/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg=
|
|
|
f93050 |
+github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5 h1:ygIc8M6trr62pF5DucadTWGdEB4mEyvzi0e2nbcmcyA=
|
|
|
f93050 |
+github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw=
|
|
|
f93050 |
+github.com/Microsoft/hcsshim v0.8.7-0.20191101173118-65519b62243c h1:YMP6olTU903X3gxQJckdmiP8/zkSMq4kN3uipsU9XjU=
|
|
|
f93050 |
+github.com/Microsoft/hcsshim v0.8.7-0.20191101173118-65519b62243c/go.mod h1:7xhjOwRV2+0HXGmM0jxaEu+ZiXJFoVZOTfL/dmqbrD8=
|
|
|
f93050 |
+github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
|
|
|
f93050 |
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
|
|
|
f93050 |
+github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f h1:tSNMc+rJDfmYntojat8lljbt1mgKNpTxUZJsSzJ9Y1s=
|
|
|
f93050 |
+github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod h1:OApqhQ4XNSNC13gXIwDjhOQxjWa/NxkwZXJ1EvqT0ko=
|
|
|
f93050 |
+github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw=
|
|
|
f93050 |
+github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
|
|
|
f93050 |
github.com/containerd/containerd v1.3.0 h1:xjvXQWABwS2uiv3TWgQt5Uth60Gu86LTGZXMJkjc7rY=
|
|
|
f93050 |
github.com/containerd/containerd v1.3.0/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
|
|
|
f93050 |
-github.com/containerd/continuity v0.0.0-20181203112020-004b46473808 h1:4BX8f882bXEDKfWIf0wa8HRvpnBoPszJJXL+TVbBw4M=
|
|
|
f93050 |
-github.com/containerd/continuity v0.0.0-20181203112020-004b46473808/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
|
|
|
f93050 |
+github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc h1:TP+534wVlf61smEIq1nwLLAjQVEK2EADoW3CX9AuT+8=
|
|
|
f93050 |
+github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
|
|
|
f93050 |
+github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI=
|
|
|
f93050 |
+github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod h1:IV7qH3hrUgRmyYrtgEeGWJfWbgcHL9CSRruz2Vqcph0=
|
|
|
f93050 |
+github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o=
|
|
|
f93050 |
+github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc=
|
|
|
f93050 |
+github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
|
|
|
f93050 |
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
|
|
f93050 |
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
|
|
f93050 |
github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug=
|
|
|
f93050 |
github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
|
|
|
f93050 |
-github.com/docker/docker v1.4.2-0.20190927142053-ada3c14355ce h1:H3csZuxZESJeeEiOxq4YXPNmLFbjl7u2qVBrAAGX/sA=
|
|
|
f93050 |
-github.com/docker/docker v1.4.2-0.20190927142053-ada3c14355ce/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
|
|
|
f93050 |
+github.com/docker/docker v1.4.2-0.20191101170500-ac7306503d23 h1:oqgGT9O61YAYvI41EBsLePOr+LE6roB0xY4gpkZuFSE=
|
|
|
f93050 |
+github.com/docker/docker v1.4.2-0.20191101170500-ac7306503d23/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
|
|
|
f93050 |
github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
|
|
|
f93050 |
github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
|
|
|
f93050 |
github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw=
|
|
|
f93050 |
github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
|
|
|
f93050 |
+github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4=
|
|
|
f93050 |
github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE=
|
|
|
f93050 |
github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
|
|
|
f93050 |
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
|
|
|
f93050 |
github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
|
|
|
f93050 |
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
|
|
f93050 |
-github.com/golang/protobuf v1.3.0 h1:kbxbvI4Un1LUWKxufD+BiE6AEExYYgkQLQmLFqA1LFk=
|
|
|
f93050 |
-github.com/golang/protobuf v1.3.0/go.mod h1:Qd/q+1AKNOZr9uGQzbzCmRO6sUih6GTPZv6a1/R87v0=
|
|
|
f93050 |
+github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg=
|
|
|
f93050 |
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
|
|
f93050 |
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
|
|
|
f93050 |
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
|
|
|
f93050 |
github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg=
|
|
|
f93050 |
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
|
|
|
f93050 |
github.com/gorilla/mux v1.7.3 h1:gnP5JzjVOuiZD07fKKToCAOjS0yOpj/qPETTXCCS6hw=
|
|
|
f93050 |
github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
|
|
|
f93050 |
+github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
|
|
|
f93050 |
+github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I=
|
|
|
f93050 |
+github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU=
|
|
|
f93050 |
+github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
|
|
|
f93050 |
github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
|
|
|
f93050 |
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
|
|
|
f93050 |
github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
|
|
|
f93050 |
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
|
|
|
f93050 |
github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c h1:nXxl5PrvVm2L/wCy8dQu6DMTwH4oIuGN8GJDAlqDdVE=
|
|
|
f93050 |
github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
|
|
|
f93050 |
+github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
|
|
|
f93050 |
github.com/opencontainers/go-digest v1.0.0-rc1 h1:WzifXhOVOEOuFYOJAW6aQqW0TooG2iki3E3Ii+WN7gQ=
|
|
|
f93050 |
github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
|
|
|
f93050 |
github.com/opencontainers/image-spec v1.0.1 h1:JMemWkRwHx4Zj+fVxWoMCFm/8sYGGrUVojFA6h/TRcI=
|
|
|
f93050 |
github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
|
|
|
f93050 |
+github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
|
|
|
f93050 |
github.com/opencontainers/runc v0.1.1 h1:GlxAyO6x8rfZYN9Tt0Kti5a/cP41iuiO2yYT0IJGY8Y=
|
|
|
f93050 |
github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
|
|
|
f93050 |
+github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
|
|
|
f93050 |
+github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod h1:r3f7wjNzSs2extwzU3Y+6pKfobzPh+kKFJ3ofN+3nfs=
|
|
|
f93050 |
github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
|
|
|
f93050 |
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
|
|
f93050 |
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
|
|
f93050 |
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
|
|
f93050 |
+github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
|
|
|
f93050 |
github.com/sirupsen/logrus v1.4.1 h1:GL2rEmy6nsikmW0r8opw9JIRScdMF5hA8cOYLH7In1k=
|
|
|
f93050 |
github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
|
|
|
f93050 |
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
|
|
f93050 |
github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
|
|
|
f93050 |
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
|
|
|
f93050 |
+github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
|
|
|
f93050 |
+github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
|
|
|
f93050 |
+github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
|
|
|
f93050 |
+github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
|
|
|
f93050 |
+github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs=
|
|
|
f93050 |
+go.opencensus.io v0.22.0 h1:C9hSCOW830chIVkdja34wa6Ky+IzWllkUinR+BtRZd4=
|
|
|
f93050 |
+go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
|
|
|
f93050 |
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M=
|
|
|
f93050 |
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
|
|
f93050 |
golang.org/x/crypto v0.0.0-20190927123631-a832865fa7ad h1:5E5raQxcv+6CZ11RrBYQe5WRbUIWpScjh0kvHZkZIrQ=
|
|
|
f93050 |
golang.org/x/crypto v0.0.0-20190927123631-a832865fa7ad/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
|
|
f93050 |
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
|
|
f93050 |
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
|
|
|
f93050 |
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
|
|
|
f93050 |
golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
|
|
|
f93050 |
-golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
|
|
f93050 |
+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
|
|
f93050 |
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
|
|
f93050 |
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
|
|
f93050 |
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
|
|
f93050 |
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
|
|
f93050 |
+golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
|
|
f93050 |
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
|
|
|
f93050 |
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
|
|
f93050 |
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
|
|
f93050 |
+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
|
|
f93050 |
+golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
|
|
f93050 |
golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
|
|
|
f93050 |
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
|
|
f93050 |
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
|
|
f93050 |
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
|
|
f93050 |
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
|
|
f93050 |
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
|
f93050 |
-golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b h1:ag/x1USPSsqHud38I9BAC88qdNLDHHtQ4mlgQIZPPNA=
|
|
|
f93050 |
-golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
|
f93050 |
+golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
|
f93050 |
+golang.org/x/sys v0.0.0-20190514135907-3a4b5fb9f71f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
|
f93050 |
+golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3 h1:7TYNF4UdlohbFwpNH04CoPMp1cHUZgO1Ebq5r2hIjfo=
|
|
|
f93050 |
+golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
|
f93050 |
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
|
|
f93050 |
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
|
|
|
f93050 |
golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
|
|
f93050 |
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
|
|
f93050 |
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
|
|
f93050 |
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
|
|
|
f93050 |
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
|
|
|
f93050 |
golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
|
|
|
f93050 |
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
|
|
|
f93050 |
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
|
|
|
f93050 |
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
|
|
|
f93050 |
-google.golang.org/genproto v0.0.0-20180831171423-11092d34479b h1:lohp5blsw53GBXtLyLNaTXPXS9pJ1tiTw61ZHUoE9Qw=
|
|
|
f93050 |
-google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
|
|
|
f93050 |
+google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb h1:i1Ppqkc3WQXikh8bXiwHqAN5Rv3/qDCcRk0/Otx73BY=
|
|
|
f93050 |
+google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
|
|
|
f93050 |
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
|
|
|
f93050 |
+google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
|
|
|
f93050 |
google.golang.org/grpc v1.22.0 h1:J0UbZOIrCAl+fpTOf8YLs4dJo8L/owV4LYVtAXQoPkw=
|
|
|
f93050 |
google.golang.org/grpc v1.22.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
|
|
|
f93050 |
gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
|
|
|
f93050 |
gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
|
|
|
f93050 |
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
|
|
f93050 |
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
|
|
f93050 |
+k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk=
|
|
|
f93050 |
diff --git a/vendor/k8s.io/client-go/pkg/version/base.go b/vendor/k8s.io/client-go/pkg/version/base.go
|
|
|
f93050 |
index e95b17bb4670..9b4c79f89519 100644
|
|
|
f93050 |
--- a/vendor/k8s.io/client-go/pkg/version/base.go
|
|
|
f93050 |
+++ b/vendor/k8s.io/client-go/pkg/version/base.go
|
|
|
f93050 |
@@ -55,8 +55,8 @@ var (
|
|
|
f93050 |
// NOTE: The $Format strings are replaced during 'git archive' thanks to the
|
|
|
f93050 |
// companion .gitattributes file containing 'export-subst' in this same
|
|
|
f93050 |
// directory. See also https://git-scm.com/docs/gitattributes
|
|
|
f93050 |
- gitVersion string = "v0.0.0-master+5cc92849f7"
|
|
|
f93050 |
- gitCommit string = "5cc92849f7fc9dd734ca2fd8f3ae8830b9a7eb26" // sha1 from git, output of $(git rev-parse HEAD)
|
|
|
f93050 |
+ gitVersion string = "v0.0.0-master+$Format:%h$"
|
|
|
f93050 |
+ gitCommit string = "$Format:%H$" // sha1 from git, output of $(git rev-parse HEAD)
|
|
|
f93050 |
gitTreeState string = "" // state of git tree, either "clean" or "dirty"
|
|
|
f93050 |
|
|
|
f93050 |
buildDate string = "1970-01-01T00:00:00Z" // build date in ISO8601 format, output of $(date -u +'%Y-%m-%dT%H:%M:%SZ')
|
|
|
f93050 |
diff --git a/vendor/modules.txt b/vendor/modules.txt
|
|
|
f93050 |
index 96aab0a0fb8e..43a9627fe01b 100644
|
|
|
f93050 |
--- a/vendor/modules.txt
|
|
|
f93050 |
+++ b/vendor/modules.txt
|
|
|
f93050 |
@@ -61,7 +61,7 @@ github.com/containernetworking/plugins/pkg/ns
|
|
|
f93050 |
github.com/containernetworking/plugins/pkg/utils/hwaddr
|
|
|
f93050 |
github.com/containernetworking/plugins/plugins/ipam/host-local/backend
|
|
|
f93050 |
github.com/containernetworking/plugins/plugins/ipam/host-local/backend/allocator
|
|
|
f93050 |
-# github.com/containers/buildah v1.11.5-0.20191031204705-20e92ffe0982
|
|
|
f93050 |
+# github.com/containers/buildah v1.11.5
|
|
|
f93050 |
github.com/containers/buildah
|
|
|
f93050 |
github.com/containers/buildah/bind
|
|
|
f93050 |
github.com/containers/buildah/chroot
|
|
|
f93050 |
@@ -204,7 +204,7 @@ github.com/docker/distribution/registry/client/auth/challenge
|
|
|
f93050 |
github.com/docker/distribution/registry/client/transport
|
|
|
f93050 |
github.com/docker/distribution/registry/storage/cache
|
|
|
f93050 |
github.com/docker/distribution/registry/storage/cache/memory
|
|
|
f93050 |
-# github.com/docker/docker v1.4.2-0.20190927142053-ada3c14355ce
|
|
|
f93050 |
+# github.com/docker/docker v1.4.2-0.20191101170500-ac7306503d23
|
|
|
f93050 |
github.com/docker/docker/api
|
|
|
f93050 |
github.com/docker/docker/api/types
|
|
|
f93050 |
github.com/docker/docker/api/types/blkiodev
|
|
|
f93050 |
@@ -264,7 +264,7 @@ github.com/etcd-io/bbolt
|
|
|
f93050 |
github.com/fatih/camelcase
|
|
|
f93050 |
# github.com/fsnotify/fsnotify v1.4.7
|
|
|
f93050 |
github.com/fsnotify/fsnotify
|
|
|
f93050 |
-# github.com/fsouza/go-dockerclient v1.5.0
|
|
|
f93050 |
+# github.com/fsouza/go-dockerclient v1.6.0
|
|
|
f93050 |
github.com/fsouza/go-dockerclient
|
|
|
f93050 |
# github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa
|
|
|
f93050 |
github.com/fullsailor/pkcs7
|
|
|
f93050 |
--
|
|
|
f93050 |
2.26.2
|
|
|
f93050 |
|