Skip to content

Remove old dependencies on dockerv1client and replace with newer equivalents #745

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 4 commits into from
Feb 25, 2021
Merged

Remove old dependencies on dockerv1client and replace with newer equivalents #745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
34dfd28
adm: Remove etcd TTL command implementation and dependency on grpc
smarterclayton Feb 19, 2021
8056e3e
cli/image/info: Change call structure to be more usable
smarterclayton Feb 19, 2021
f849f4c
cmd/newapp: Stop using the old docker client and use ImageRetriever
smarterclayton Feb 19, 2021
834a8d0
vendor: Remove dependencies on older docker client code and bump
smarterclayton Feb 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
35 changes: 19 additions & 16 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,24 @@ require (
github.com/containers/storage v0.0.0-20190726081758-912de200380a // indirect
github.com/davecgh/go-spew v1.1.1
github.com/docker/distribution v2.7.1+incompatible
github.com/docker/docker v17.12.0-ce-rc1.0.20200916142827-bd33bbf0497b+incompatible
github.com/docker/docker v20.10.3+incompatible
github.com/docker/go-units v0.4.0
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7
github.com/elazarl/goproxy v0.0.0-20190911111923-ecfe977594f1
github.com/fsnotify/fsnotify v1.4.9
github.com/fsouza/go-dockerclient v0.0.0-20171004212419-da3951ba2e9e
github.com/fsouza/go-dockerclient v1.7.1
github.com/garyburd/redigo v1.6.0 // indirect
github.com/ghodss/yaml v1.0.0
github.com/gofrs/uuid v3.2.0+incompatible // indirect
github.com/golang/mock v1.4.3 // indirect
github.com/gonum/diff v0.0.0-20181124234638-500114f11e71 // indirect
github.com/gonum/graph v0.0.0-20170401004347-50b27dea7ebb
github.com/gonum/integrate v0.0.0-20181209220457-a422b5c0fdf2 // indirect
github.com/gonum/mathext v0.0.0-20181121095525-8a4bf007ea55 // indirect
github.com/gonum/stat v0.0.0-20181125101827-41a0da705a5b // indirect
github.com/google/go-cmp v0.5.2
github.com/google/go-cmp v0.5.4
github.com/gorilla/handlers v1.4.2 // indirect
github.com/magefile/mage v1.11.0 // indirect
github.com/mitchellh/go-wordwrap v1.0.0
github.com/moby/buildkit v0.0.0-20181107081847-c3a857e3fca0
github.com/mtrmac/gpgme v0.1.2 // indirect
Expand All @@ -45,27 +47,33 @@ require (
github.com/openshift/api v0.0.0-20201216151826-78a19e96f9eb
github.com/openshift/build-machinery-go v0.0.0-20200917070002-f171684f77ab
github.com/openshift/client-go v0.0.0-20201214125552-e615e336eb49
github.com/openshift/library-go v0.0.0-20210106214821-c4d0b9c8d55f
github.com/openshift/library-go v0.0.0-20210219155623-0260bfd7946b
github.com/operator-framework/operator-registry v1.8.0
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.7.1
github.com/prometheus/client_golang v1.9.0
github.com/prometheus/common v0.17.0 // indirect
github.com/prometheus/procfs v0.6.0 // indirect
github.com/russross/blackfriday v1.5.2
github.com/spf13/cobra v1.1.1
github.com/sirupsen/logrus v1.8.0 // indirect
github.com/spf13/cobra v1.1.3
github.com/spf13/pflag v1.0.5
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
github.com/xeipuuv/gojsonschema v1.1.0 // indirect
github.com/yvasiyarov/go-metrics v0.0.0-20150112132944-c25f46c4b940 // indirect
github.com/yvasiyarov/gorelic v0.0.7 // indirect
github.com/yvasiyarov/newrelic_platform_go v0.0.0-20160601141957-9c099fbc30e9 // indirect
go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489
golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4
golang.org/x/crypto v0.0.0-20210218145215-b8e89b74b9df
golang.org/x/sys v0.0.0-20210219172841-57ea560cfca1
golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf // indirect
golang.org/x/text v0.3.5 // indirect
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e
golang.org/x/tools v0.1.0 // indirect
google.golang.org/genproto v0.0.0-20210219173056-d891e3cb3b5b // indirect
google.golang.org/grpc v1.35.0 // indirect
gopkg.in/ldap.v2 v2.5.1
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
k8s.io/api v0.20.1
k8s.io/apimachinery v0.20.1
k8s.io/apimachinery v0.20.4
k8s.io/apiserver v0.20.1
k8s.io/cli-runtime v0.20.1
k8s.io/client-go v0.20.1
Expand All @@ -81,11 +89,6 @@ replace (
github.com/Microsoft/hcsshim => github.com/Microsoft/hcsshim v0.8.7
github.com/apcera/gssapi => github.com/openshift/gssapi v0.0.0-20161010215902-5fb4217df13b
github.com/containers/image => github.com/openshift/containers-image v0.0.0-20190130162819-76de87591e9d
// Taking changes from https://github.com/moby/moby/pull/40021 to accomodate new version of golang.org/x/sys.
// Although the PR lists c3a0a3744636069f43197eb18245aaae89f568e5 as the commit with the fixes,
// d1d5f6476656c6aad457e2a91d3436e66b6f2251 is more suitable since it does not break fsouza/go-clientdocker,
// yet provides the same fix.
github.com/docker/docker => github.com/docker/docker v1.4.2-0.20191121165722-d1d5f6476656

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