summaryrefslogtreecommitdiff
path: root/vendor/github.com/docker
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2021-01-14 14:15:31 -0500
committerDaniel J Walsh <dwalsh@redhat.com>2021-01-15 06:23:19 -0500
commitc88022589aa3aa10593e7956cdf52d9e231f254d (patch)
treed7959007263149f6337e07cf1938042eb14c65a2 /vendor/github.com/docker
parent3fcf346890c0437611fc18c30d58cc2d9f61fe6c (diff)
downloadpodman-c88022589aa3aa10593e7956cdf52d9e231f254d.tar.gz
podman-c88022589aa3aa10593e7956cdf52d9e231f254d.tar.bz2
podman-c88022589aa3aa10593e7956cdf52d9e231f254d.zip
Bump to containers/buildah 1.9.2
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'vendor/github.com/docker')
-rw-r--r--vendor/github.com/docker/docker/api/swagger.yaml4
-rw-r--r--vendor/github.com/docker/docker/api/types/mount/mount.go2
-rw-r--r--vendor/github.com/docker/docker/pkg/system/chtimes_nowindows.go (renamed from vendor/github.com/docker/docker/pkg/system/chtimes_unix.go)0
-rw-r--r--vendor/github.com/docker/docker/pkg/system/rm.go (renamed from vendor/github.com/docker/docker/pkg/system/rm_unix.go)2
4 files changed, 4 insertions, 4 deletions
diff --git a/vendor/github.com/docker/docker/api/swagger.yaml b/vendor/github.com/docker/docker/api/swagger.yaml
index 0ff649013..9f1019681 100644
--- a/vendor/github.com/docker/docker/api/swagger.yaml
+++ b/vendor/github.com/docker/docker/api/swagger.yaml
@@ -8023,7 +8023,7 @@ paths:
API-Version:
type: "string"
description: "Max API Version the server supports"
- BuildKit-Version:
+ Builder-Version:
type: "string"
description: "Default version of docker image builder"
Docker-Experimental:
@@ -8062,7 +8062,7 @@ paths:
API-Version:
type: "string"
description: "Max API Version the server supports"
- BuildKit-Version:
+ Builder-Version:
type: "string"
description: "Default version of docker image builder"
Docker-Experimental:
diff --git a/vendor/github.com/docker/docker/api/types/mount/mount.go b/vendor/github.com/docker/docker/api/types/mount/mount.go
index ab4446b38..443b8d07a 100644
--- a/vendor/github.com/docker/docker/api/types/mount/mount.go
+++ b/vendor/github.com/docker/docker/api/types/mount/mount.go
@@ -113,7 +113,7 @@ type TmpfsOptions struct {
// TODO(stevvooe): There are several more tmpfs flags, specified in the
// daemon, that are accepted. Only the most basic are added for now.
//
- // From docker/docker/pkg/mount/flags.go:
+ // From https://github.com/moby/sys/blob/mount/v0.1.1/mount/flags.go#L47-L56
//
// var validFlags = map[string]bool{
// "": true,
diff --git a/vendor/github.com/docker/docker/pkg/system/chtimes_unix.go b/vendor/github.com/docker/docker/pkg/system/chtimes_nowindows.go
index d5fab96f9..d5fab96f9 100644
--- a/vendor/github.com/docker/docker/pkg/system/chtimes_unix.go
+++ b/vendor/github.com/docker/docker/pkg/system/chtimes_nowindows.go
diff --git a/vendor/github.com/docker/docker/pkg/system/rm_unix.go b/vendor/github.com/docker/docker/pkg/system/rm.go
index 6ba3fb3ae..c5d80ebda 100644
--- a/vendor/github.com/docker/docker/pkg/system/rm_unix.go
+++ b/vendor/github.com/docker/docker/pkg/system/rm.go
@@ -1,4 +1,4 @@
-// +build !windows
+// +build !darwin,!windows
package system // import "github.com/docker/docker/pkg/system"