Skip to content

Commit

Permalink
[DNM] vendor: update docker to test resolvconf patch
Browse files Browse the repository at this point in the history 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
  • Loading branch information
@tonistiigi
tonistiigi committed Feb 29, 2024
1 parent f3845b4 commit ea72f47
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 10 deletions.
2 changes: 2 additions & 0 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,3 +173,5 @@ require (
gopkg.in/yaml.v3 v3.0.1 // indirect
kernel.org/pub/linux/libs/security/libcap/psx v1.2.67 // indirect
)

replace github.com/docker/docker => github.com/robmry/moby v0.0.0-20240229231553-bcc0ad7b9776
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,6 @@ github.com/dnaeon/go-vcr v1.1.0 h1:ReYa/UBrRyQdant9B4fNHGoCNKw6qh6P0fsdGmZpR7c=
github.com/dnaeon/go-vcr v1.1.0/go.mod h1:M7tiix8f0r6mKKJ3Yq/kqU1OYf3MnfmBWVbPx/yU9ko=
github.com/docker/cli v26.0.0-rc1+incompatible h1:PVxv2ySd8iZHoNfoAoKcnWSC/hKP2qMb806PWM34v50=
github.com/docker/cli v26.0.0-rc1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
github.com/docker/docker v26.0.0-rc1.0.20240229165828-b8aa8579cad7+incompatible h1:Cn68xHMN3JzNSUjmK45IKcMr0z9RmpIcdMH63bw3DA0=
github.com/docker/docker v26.0.0-rc1.0.20240229165828-b8aa8579cad7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/docker-credential-helpers v0.8.0 h1:YQFtbBQb4VrpoPxhFuzEBPQ9E16qz5SpHLS+uswaCp8=
github.com/docker/docker-credential-helpers v0.8.0/go.mod h1:UGFXcuoQ5TxPiB54nHOZ32AWRqQdECoh/Mg0AlEYb40=
github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
Expand Down Expand Up @@ -372,6 +370,8 @@ github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDa
github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
github.com/robmry/moby v0.0.0-20240229231553-bcc0ad7b9776 h1:Fz+svPqOcrhKDpO5UHXasHYee5Ljrf9Vo02v18Uth3k=
github.com/robmry/moby v0.0.0-20240229231553-bcc0ad7b9776/go.mod h1:tK57zForIqPPqk4JYALsLA3tBLXqhVUsS8pzfzspDm0=
github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
Expand Down
16 changes: 9 additions & 7 deletions vendor/github.com/docker/docker/libnetwork/internal/resolvconf/resolvconf.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion vendor/modules.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ github.com/docker/cli/cli/config/configfile
github.com/docker/cli/cli/config/credentials
github.com/docker/cli/cli/config/types
github.com/docker/cli/cli/connhelper/commandconn
# github.com/docker/docker v26.0.0-rc1.0.20240229165828-b8aa8579cad7+incompatible
# github.com/docker/docker v26.0.0-rc1.0.20240229165828-b8aa8579cad7+incompatible => github.com/robmry/moby v0.0.0-20240229231553-bcc0ad7b9776
## explicit
github.com/docker/docker/api
github.com/docker/docker/api/types
Expand Down Expand Up @@ -1099,3 +1099,4 @@ kernel.org/pub/linux/libs/security/libcap/cap
# kernel.org/pub/linux/libs/security/libcap/psx v1.2.67
## explicit; go 1.11
kernel.org/pub/linux/libs/security/libcap/psx
# github.com/docker/docker => github.com/robmry/moby v0.0.0-20240229231553-bcc0ad7b9776

0 comments on commit ea72f47

Please sign in to comment.