mirror of https://github.com/docker/cli.git
vendor: github.com/docker/docker v23.0.0-rc.3
full diff: https://github.com/docker/docker/compare/v23.0.0-rc.2...v23.0.0-rc.3 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
parent
c4fff9da13
commit
8672540f8c
|
@ -10,7 +10,7 @@ require (
|
||||||
github.com/containerd/containerd v1.6.15
|
github.com/containerd/containerd v1.6.15
|
||||||
github.com/creack/pty v1.1.11
|
github.com/creack/pty v1.1.11
|
||||||
github.com/docker/distribution v2.8.1+incompatible
|
github.com/docker/distribution v2.8.1+incompatible
|
||||||
github.com/docker/docker v23.0.0-rc.2+incompatible
|
github.com/docker/docker v23.0.0-rc.3+incompatible
|
||||||
github.com/docker/docker-credential-helpers v0.7.0
|
github.com/docker/docker-credential-helpers v0.7.0
|
||||||
github.com/docker/go-connections v0.4.0
|
github.com/docker/go-connections v0.4.0
|
||||||
github.com/docker/go-units v0.5.0
|
github.com/docker/go-units v0.5.0
|
||||||
|
|
|
@ -101,8 +101,8 @@ github.com/denisenkom/go-mssqldb v0.0.0-20191128021309-1d7a30a10f73/go.mod h1:xb
|
||||||
github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
|
github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
|
||||||
github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68=
|
github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68=
|
||||||
github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
|
github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
|
||||||
github.com/docker/docker v23.0.0-rc.2+incompatible h1:ykf9hN84Qce1oA8WcE1nsQaMtzwZ3p4trDbKBQDhXhI=
|
github.com/docker/docker v23.0.0-rc.3+incompatible h1:97RCXK7nxN1YPlqb3z0+AoTE3rql4ck1CG5p9tlRD2o=
|
||||||
github.com/docker/docker v23.0.0-rc.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
|
github.com/docker/docker v23.0.0-rc.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
|
||||||
github.com/docker/docker-credential-helpers v0.7.0 h1:xtCHsjxogADNZcdv1pKUHXryefjlVRqWqIhk/uXJp0A=
|
github.com/docker/docker-credential-helpers v0.7.0 h1:xtCHsjxogADNZcdv1pKUHXryefjlVRqWqIhk/uXJp0A=
|
||||||
github.com/docker/docker-credential-helpers v0.7.0/go.mod h1:rETQfLdHNT3foU5kuNkFR1R1V12OJRRO5lzt2D1b5X0=
|
github.com/docker/docker-credential-helpers v0.7.0/go.mod h1:rETQfLdHNT3foU5kuNkFR1R1V12OJRRO5lzt2D1b5X0=
|
||||||
github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c h1:lzqkGL9b3znc+ZUgi7FlLnqjQhcXxkNM/quxIjBVMD0=
|
github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c h1:lzqkGL9b3znc+ZUgi7FlLnqjQhcXxkNM/quxIjBVMD0=
|
||||||
|
|
|
@ -26,3 +26,8 @@ func GetDataHome() (string, error) {
|
||||||
func GetConfigHome() (string, error) {
|
func GetConfigHome() (string, error) {
|
||||||
return "", errors.New("homedir.GetConfigHome() is not supported on this system")
|
return "", errors.New("homedir.GetConfigHome() is not supported on this system")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GetLibHome is unsupported on non-linux system.
|
||||||
|
func GetLibHome() (string, error) {
|
||||||
|
return "", errors.New("homedir.GetLibHome() is not supported on this system")
|
||||||
|
}
|
||||||
|
|
|
@ -34,6 +34,7 @@ type BytesPipe struct {
|
||||||
buf []*fixedBuffer
|
buf []*fixedBuffer
|
||||||
bufLen int
|
bufLen int
|
||||||
closeErr error // error to return from next Read. set to nil if not closed.
|
closeErr error // error to return from next Read. set to nil if not closed.
|
||||||
|
readBlock bool // check read BytesPipe is Wait() or not
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewBytesPipe creates new BytesPipe, initialized by specified slice.
|
// NewBytesPipe creates new BytesPipe, initialized by specified slice.
|
||||||
|
@ -85,6 +86,9 @@ loop0:
|
||||||
|
|
||||||
// make sure the buffer doesn't grow too big from this write
|
// make sure the buffer doesn't grow too big from this write
|
||||||
for bp.bufLen >= blockThreshold {
|
for bp.bufLen >= blockThreshold {
|
||||||
|
if bp.readBlock {
|
||||||
|
bp.wait.Broadcast()
|
||||||
|
}
|
||||||
bp.wait.Wait()
|
bp.wait.Wait()
|
||||||
if bp.closeErr != nil {
|
if bp.closeErr != nil {
|
||||||
continue loop0
|
continue loop0
|
||||||
|
@ -129,7 +133,9 @@ func (bp *BytesPipe) Read(p []byte) (n int, err error) {
|
||||||
if bp.closeErr != nil {
|
if bp.closeErr != nil {
|
||||||
return 0, bp.closeErr
|
return 0, bp.closeErr
|
||||||
}
|
}
|
||||||
|
bp.readBlock = true
|
||||||
bp.wait.Wait()
|
bp.wait.Wait()
|
||||||
|
bp.readBlock = false
|
||||||
if bp.bufLen == 0 && bp.closeErr != nil {
|
if bp.bufLen == 0 && bp.closeErr != nil {
|
||||||
return 0, bp.closeErr
|
return 0, bp.closeErr
|
||||||
}
|
}
|
||||||
|
|
|
@ -39,7 +39,7 @@ github.com/docker/distribution/registry/client/transport
|
||||||
github.com/docker/distribution/registry/storage/cache
|
github.com/docker/distribution/registry/storage/cache
|
||||||
github.com/docker/distribution/registry/storage/cache/memory
|
github.com/docker/distribution/registry/storage/cache/memory
|
||||||
github.com/docker/distribution/uuid
|
github.com/docker/distribution/uuid
|
||||||
# github.com/docker/docker v23.0.0-rc.2+incompatible
|
# github.com/docker/docker v23.0.0-rc.3+incompatible
|
||||||
## explicit
|
## explicit
|
||||||
github.com/docker/docker/api
|
github.com/docker/docker/api
|
||||||
github.com/docker/docker/api/types
|
github.com/docker/docker/api/types
|
||||||
|
|
Loading…
Reference in New Issue