vendor: github.com/docker/docker 7c69b6dc08c7
full diff: 2ed904cad7...7c69b6dc08
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
4
vendor/github.com/docker/docker/pkg/archive/copy.go
generated
vendored
4
vendor/github.com/docker/docker/pkg/archive/copy.go
generated
vendored
@ -29,8 +29,8 @@ var (
|
||||
// clean path already ends in the separator, then another is not added.
|
||||
func PreserveTrailingDotOrSeparator(cleanedPath string, originalPath string, sep byte) string {
|
||||
// Ensure paths are in platform semantics
|
||||
cleanedPath = strings.Replace(cleanedPath, "/", string(sep), -1)
|
||||
originalPath = strings.Replace(originalPath, "/", string(sep), -1)
|
||||
cleanedPath = strings.ReplaceAll(cleanedPath, "/", string(sep))
|
||||
originalPath = strings.ReplaceAll(originalPath, "/", string(sep))
|
||||
|
||||
if !specifiesCurrentDir(cleanedPath) && specifiesCurrentDir(originalPath) {
|
||||
if !hasTrailingPathSeparator(cleanedPath, sep) {
|
||||
|
||||
1
vendor/github.com/docker/docker/pkg/system/process_unix.go
generated
vendored
1
vendor/github.com/docker/docker/pkg/system/process_unix.go
generated
vendored
@ -33,6 +33,7 @@ func IsProcessZombie(pid int) (bool, error) {
|
||||
statPath := fmt.Sprintf("/proc/%d/stat", pid)
|
||||
dataBytes, err := os.ReadFile(statPath)
|
||||
if err != nil {
|
||||
// TODO(thaJeztah) should we ignore os.IsNotExist() here? ("/proc/<pid>/stat" will be gone if the process exited)
|
||||
return false, err
|
||||
}
|
||||
data := string(dataBytes)
|
||||
|
||||
2
vendor/github.com/docker/docker/registry/config_windows.go
generated
vendored
2
vendor/github.com/docker/docker/registry/config_windows.go
generated
vendored
@ -16,5 +16,5 @@ var defaultCertsDir = os.Getenv("programdata") + `\docker\certs.d`
|
||||
// https:\index.docker.io\v1. Not all platforms support directory names
|
||||
// which contain those characters (such as : on Windows)
|
||||
func cleanPath(s string) string {
|
||||
return filepath.FromSlash(strings.Replace(s, ":", "", -1))
|
||||
return filepath.FromSlash(strings.ReplaceAll(s, ":", ""))
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user