diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-06-10 07:52:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-10 07:52:46 -0400 |
| commit | efc1936c7c591cb3b552246ff4687c8631456168 (patch) | |
| tree | 057d0f294bf22414526a033b48af2fa41edb93a2 /vendor/github.com/fsouza/go-dockerclient/go.mod | |
| parent | 9f1bd0a0a1494f46a49ca7f22511c5a78006afd8 (diff) | |
| parent | d4272bed51e2060d431ad042e803770e4d2fe64e (diff) | |
| download | podman-efc1936c7c591cb3b552246ff4687c8631456168.tar.gz podman-efc1936c7c591cb3b552246ff4687c8631456168.tar.bz2 podman-efc1936c7c591cb3b552246ff4687c8631456168.zip | |
Merge pull request #14526 from vrothberg/fix-14420
podman cp: do not overwrite non-dirs with dirs and vice versa
Diffstat (limited to 'vendor/github.com/fsouza/go-dockerclient/go.mod')
| -rw-r--r-- | vendor/github.com/fsouza/go-dockerclient/go.mod | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/vendor/github.com/fsouza/go-dockerclient/go.mod b/vendor/github.com/fsouza/go-dockerclient/go.mod index 1e06cdeed..06fe42430 100644 --- a/vendor/github.com/fsouza/go-dockerclient/go.mod +++ b/vendor/github.com/fsouza/go-dockerclient/go.mod @@ -4,27 +4,31 @@ go 1.17 require ( github.com/Microsoft/go-winio v0.5.2 - github.com/docker/docker v20.10.3-0.20220208084023-a5c757555091+incompatible + github.com/docker/docker v20.10.17+incompatible github.com/docker/go-units v0.4.0 github.com/google/go-cmp v0.5.8 github.com/gorilla/mux v1.8.0 - golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b + golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 ) require ( github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect - github.com/containerd/containerd v1.6.1 // indirect + github.com/Microsoft/hcsshim v0.9.3 // indirect + github.com/containerd/cgroups v1.0.3 // indirect + github.com/containerd/containerd v1.6.6 // indirect github.com/docker/go-connections v0.4.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/klauspost/compress v1.11.13 // indirect - github.com/moby/sys/mount v0.2.0 // indirect - github.com/moby/sys/mountinfo v0.5.0 // indirect + github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect + github.com/moby/sys/mount v0.3.3 // indirect + github.com/moby/sys/mountinfo v0.6.2 // indirect github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect github.com/morikuni/aec v1.0.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect - github.com/opencontainers/image-spec v1.0.2 // indirect - github.com/opencontainers/runc v1.1.0 // indirect + github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect + github.com/opencontainers/runc v1.1.2 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/sirupsen/logrus v1.8.1 // indirect - golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect + go.opencensus.io v0.23.0 // indirect + golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect ) |