Skip to content

Commit 834a8d0

Browse files
vendor: Remove dependencies on older docker client code and bump
Move to a newer version fsouza/go-dockerclient that removes the very, very, very, very old dependencies in our tree. At this point only newapp uses the Docker API, but we want to remain as compatible as possible. It is likely this breaks compatibility with RHEL7 clients using older Docker versions and that is ok.
1 parent f849f4c commit 834a8d0

File tree

1,163 files changed

+100895
-61358
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,163 files changed

+100895
-61358
lines changed

go.mod

+19-16
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,24 @@ require (
2121
github.com/containers/storage v0.0.0-20190726081758-912de200380a // indirect
2222
github.com/davecgh/go-spew v1.1.1
2323
github.com/docker/distribution v2.7.1+incompatible
24-
github.com/docker/docker v17.12.0-ce-rc1.0.20200916142827-bd33bbf0497b+incompatible
24+
github.com/docker/docker v20.10.3+incompatible
2525
github.com/docker/go-units v0.4.0
2626
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7
2727
github.com/elazarl/goproxy v0.0.0-20190911111923-ecfe977594f1
2828
github.com/fsnotify/fsnotify v1.4.9
29-
github.com/fsouza/go-dockerclient v0.0.0-20171004212419-da3951ba2e9e
29+
github.com/fsouza/go-dockerclient v1.7.1
3030
github.com/garyburd/redigo v1.6.0 // indirect
3131
github.com/ghodss/yaml v1.0.0
3232
github.com/gofrs/uuid v3.2.0+incompatible // indirect
33+
github.com/golang/mock v1.4.3 // indirect
3334
github.com/gonum/diff v0.0.0-20181124234638-500114f11e71 // indirect
3435
github.com/gonum/graph v0.0.0-20170401004347-50b27dea7ebb
3536
github.com/gonum/integrate v0.0.0-20181209220457-a422b5c0fdf2 // indirect
3637
github.com/gonum/mathext v0.0.0-20181121095525-8a4bf007ea55 // indirect
3738
github.com/gonum/stat v0.0.0-20181125101827-41a0da705a5b // indirect
38-
github.com/google/go-cmp v0.5.2
39+
github.com/google/go-cmp v0.5.4
3940
github.com/gorilla/handlers v1.4.2 // indirect
41+
github.com/magefile/mage v1.11.0 // indirect
4042
github.com/mitchellh/go-wordwrap v1.0.0
4143
github.com/moby/buildkit v0.0.0-20181107081847-c3a857e3fca0
4244
github.com/mtrmac/gpgme v0.1.2 // indirect
@@ -45,27 +47,33 @@ require (
4547
github.com/openshift/api v0.0.0-20201216151826-78a19e96f9eb
4648
github.com/openshift/build-machinery-go v0.0.0-20200917070002-f171684f77ab
4749
github.com/openshift/client-go v0.0.0-20201214125552-e615e336eb49
48-
github.com/openshift/library-go v0.0.0-20210106214821-c4d0b9c8d55f
50+
github.com/openshift/library-go v0.0.0-20210219155623-0260bfd7946b
4951
github.com/operator-framework/operator-registry v1.8.0
5052
github.com/pkg/errors v0.9.1
51-
github.com/prometheus/client_golang v1.7.1
53+
github.com/prometheus/client_golang v1.9.0
54+
github.com/prometheus/common v0.17.0 // indirect
55+
github.com/prometheus/procfs v0.6.0 // indirect
5256
github.com/russross/blackfriday v1.5.2
53-
github.com/spf13/cobra v1.1.1
57+
github.com/sirupsen/logrus v1.8.0 // indirect
58+
github.com/spf13/cobra v1.1.3
5459
github.com/spf13/pflag v1.0.5
5560
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
5661
github.com/xeipuuv/gojsonschema v1.1.0 // indirect
5762
github.com/yvasiyarov/go-metrics v0.0.0-20150112132944-c25f46c4b940 // indirect
5863
github.com/yvasiyarov/gorelic v0.0.7 // indirect
5964
github.com/yvasiyarov/newrelic_platform_go v0.0.0-20160601141957-9c099fbc30e9 // indirect
60-
go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489
61-
golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0
62-
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
63-
golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4
65+
golang.org/x/crypto v0.0.0-20210218145215-b8e89b74b9df
66+
golang.org/x/sys v0.0.0-20210219172841-57ea560cfca1
67+
golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf // indirect
68+
golang.org/x/text v0.3.5 // indirect
6469
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e
6570
golang.org/x/tools v0.1.0 // indirect
71+
google.golang.org/genproto v0.0.0-20210219173056-d891e3cb3b5b // indirect
72+
google.golang.org/grpc v1.35.0 // indirect
6673
gopkg.in/ldap.v2 v2.5.1
74+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
6775
k8s.io/api v0.20.1
68-
k8s.io/apimachinery v0.20.1
76+
k8s.io/apimachinery v0.20.4
6977
k8s.io/apiserver v0.20.1
7078
k8s.io/cli-runtime v0.20.1
7179
k8s.io/client-go v0.20.1
@@ -81,11 +89,6 @@ replace (
8189
github.com/Microsoft/hcsshim => github.com/Microsoft/hcsshim v0.8.7
8290
github.com/apcera/gssapi => github.com/openshift/gssapi v0.0.0-20161010215902-5fb4217df13b
8391
github.com/containers/image => github.com/openshift/containers-image v0.0.0-20190130162819-76de87591e9d
84-
// Taking changes from https://github.com/moby/moby/pull/40021 to accomodate new version of golang.org/x/sys.
85-
// Although the PR lists c3a0a3744636069f43197eb18245aaae89f568e5 as the commit with the fixes,
86-
// d1d5f6476656c6aad457e2a91d3436e66b6f2251 is more suitable since it does not break fsouza/go-clientdocker,
87-
// yet provides the same fix.
88-
github.com/docker/docker => github.com/docker/docker v1.4.2-0.20191121165722-d1d5f6476656
8992

9093
k8s.io/apimachinery => github.com/openshift/kubernetes-apimachinery v0.0.0-20210108114224-194a87c5b03a
9194
k8s.io/cli-runtime => github.com/openshift/kubernetes-cli-runtime v0.0.0-20210108114725-2ff6add1e911

0 commit comments

Comments
 (0)