vendor: update docker/docker to latest v25.0.0-dev

full diff: https://github.com/docker/docker/compare/88f4bf4ae4ba...cf4df9d8ae4c62e38789d8d7e02da7db393fb4c0 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2023-05-24 01:24:56 +02:00
parent 5be21394cb
commit db5e1fa544
58 changed files with 88 additions and 486 deletions
@@ -70,6 +70,12 @@ type (
 		// replaced with the matching name from this map.
 		RebaseNames map[string]string
 		InUserNS    bool
+		// Allow unpacking to succeed in spite of failures to set extended
+		// attributes on the unpacked files due to the destination filesystem
+		// not supporting them or a lack of permissions. Extended attributes
+		// were probably in the archive for a reason, so set this option at
+		// your own peril.
+		BestEffortXattrs bool
 	}
 )

@@ -666,7 +672,19 @@ func (ta *tarAppender) addTarFile(path, name string) error {
 	return nil
 }

-func createTarFile(path, extractDir string, hdr *tar.Header, reader io.Reader, Lchown bool, chownOpts *idtools.Identity, inUserns bool) error {
+func createTarFile(path, extractDir string, hdr *tar.Header, reader io.Reader, opts *TarOptions) error {
+	var (
+		Lchown                     = true
+		inUserns, bestEffortXattrs bool
+		chownOpts                  *idtools.Identity
+	)
+	if opts != nil {
+		Lchown = !opts.NoLchown
+		inUserns = opts.InUserNS
+		chownOpts = opts.ChownOpts
+		bestEffortXattrs = opts.BestEffortXattrs
+	}
+
 	// hdr.Mode is in linux format, which we can use for sycalls,
 	// but for os.Foo() calls we need the mode converted to os.FileMode,
 	// so use hdrInfo.Mode() (they differ for e.g. setuid bits)
@@ -757,26 +775,22 @@ func createTarFile(path, extractDir string, hdr *tar.Header, reader io.Reader, L
 		}
 	}

-	var errors []string
+	var xattrErrs []string
 	for key, value := range hdr.Xattrs {
 		if err := system.Lsetxattr(path, key, []byte(value), 0); err != nil {
-			if err == syscall.ENOTSUP || err == syscall.EPERM {
-				// We ignore errors here because not all graphdrivers support
-				// xattrs *cough* old versions of AUFS *cough*. However only
-				// ENOTSUP should be emitted in that case, otherwise we still
-				// bail.
+			if bestEffortXattrs && errors.Is(err, syscall.ENOTSUP) || errors.Is(err, syscall.EPERM) {
 				// EPERM occurs if modifying xattrs is not allowed. This can
 				// happen when running in userns with restrictions (ChromeOS).
-				errors = append(errors, err.Error())
+				xattrErrs = append(xattrErrs, err.Error())
 				continue
 			}
 			return err
 		}
 	}

-	if len(errors) > 0 {
+	if len(xattrErrs) > 0 {
 		logrus.WithFields(logrus.Fields{
-			"errors": errors,
+			"errors": xattrErrs,
 		}).Warn("ignored xattrs in archive: underlying filesystem doesn't support them")
 	}

@@ -1158,7 +1172,7 @@ loop:
 			}
 		}

-		if err := createTarFile(path, dest, hdr, trBuf, !options.NoLchown, options.ChownOpts, options.InUserNS); err != nil {
+		if err := createTarFile(path, dest, hdr, trBuf, options); err != nil {
 			return err
 		}

@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux

 package archive // import "github.com/docker/docker/pkg/archive"

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows

 package archive // import "github.com/docker/docker/pkg/archive"

@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux

 package archive // import "github.com/docker/docker/pkg/archive"

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows

 package archive // import "github.com/docker/docker/pkg/archive"

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows

 package archive // import "github.com/docker/docker/pkg/archive"

@@ -92,7 +92,7 @@ func UnpackLayer(dest string, layer io.Reader, options *TarOptions) (size int64,
 					}
 					defer os.RemoveAll(aufsTempdir)
 				}
-				if err := createTarFile(filepath.Join(aufsTempdir, basename), dest, hdr, tr, true, nil, options.InUserNS); err != nil {
+				if err := createTarFile(filepath.Join(aufsTempdir, basename), dest, hdr, tr, options); err != nil {
 					return 0, err
 				}
 			}
@@ -183,7 +183,7 @@ func UnpackLayer(dest string, layer io.Reader, options *TarOptions) (size int64,
 				return 0, err
 			}

-			if err := createTarFile(path, dest, srcHdr, srcData, !options.NoLchown, nil, options.InUserNS); err != nil {
+			if err := createTarFile(path, dest, srcHdr, srcData, options); err != nil {
 				return 0, err
 			}

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows

 package archive

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows

 package archive

@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux

 package archive // import "github.com/docker/docker/pkg/archive"

@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux

 package homedir // import "github.com/docker/docker/pkg/homedir"

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows

 package homedir // import "github.com/docker/docker/pkg/homedir"

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows

 package idtools // import "github.com/docker/docker/pkg/idtools"

@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux

 package idtools // import "github.com/docker/docker/pkg/idtools"

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows

 package idtools // import "github.com/docker/docker/pkg/idtools"

@@ -1,10 +0,0 @@
-package ioutils
-
-import "github.com/docker/docker/pkg/longpath"
-
-// TempDir is the equivalent of [os.MkdirTemp], except that on Windows
-// the result is in Windows longpath format. On Unix systems it is
-// equivalent to [os.MkdirTemp].
-//
-// Deprecated: use [longpath.MkdirTemp].
-var TempDir = longpath.MkdirTemp
@@ -1,26 +0,0 @@
-// Package meminfo provides utilites to retrieve memory statistics of
-// the host system.
-package meminfo
-
-// Read retrieves memory statistics of the host system and returns a
-// Memory type. It is only supported on Linux and Windows, and returns an
-// error on other platforms.
-func Read() (*Memory, error) {
-	return readMemInfo()
-}
-
-// Memory contains memory statistics of the host system.
-type Memory struct {
-	// Total usable RAM (i.e. physical RAM minus a few reserved bits and the
-	// kernel binary code).
-	MemTotal int64
-
-	// Amount of free memory.
-	MemFree int64
-
-	// Total amount of swap space available.
-	SwapTotal int64
-
-	// Amount of swap space that is currently unused.
-	SwapFree int64
-}
@@ -1,69 +0,0 @@
-package meminfo
-
-import (
-	"bufio"
-	"io"
-	"os"
-	"strconv"
-	"strings"
-)
-
-// readMemInfo retrieves memory statistics of the host system and returns a
-// Memory type.
-func readMemInfo() (*Memory, error) {
-	file, err := os.Open("/proc/meminfo")
-	if err != nil {
-		return nil, err
-	}
-	defer file.Close()
-	return parseMemInfo(file)
-}
-
-// parseMemInfo parses the /proc/meminfo file into
-// a Memory object given an io.Reader to the file.
-// Throws error if there are problems reading from the file
-func parseMemInfo(reader io.Reader) (*Memory, error) {
-	meminfo := &Memory{}
-	scanner := bufio.NewScanner(reader)
-	memAvailable := int64(-1)
-	for scanner.Scan() {
-		// Expected format: ["MemTotal:", "1234", "kB"]
-		parts := strings.Fields(scanner.Text())
-
-		// Sanity checks: Skip malformed entries.
-		if len(parts) < 3 || parts[2] != "kB" {
-			continue
-		}
-
-		// Convert to bytes.
-		size, err := strconv.Atoi(parts[1])
-		if err != nil {
-			continue
-		}
-		// Convert to KiB
-		bytes := int64(size) * 1024
-
-		switch parts[0] {
-		case "MemTotal:":
-			meminfo.MemTotal = bytes
-		case "MemFree:":
-			meminfo.MemFree = bytes
-		case "MemAvailable:":
-			memAvailable = bytes
-		case "SwapTotal:":
-			meminfo.SwapTotal = bytes
-		case "SwapFree:":
-			meminfo.SwapFree = bytes
-		}
-	}
-	if memAvailable != -1 {
-		meminfo.MemFree = memAvailable
-	}
-
-	// Handle errors that may have occurred during the reading of the file.
-	if err := scanner.Err(); err != nil {
-		return nil, err
-	}
-
-	return meminfo, nil
-}
@@ -1,11 +0,0 @@
-//go:build !linux && !windows
-// +build !linux,!windows
-
-package meminfo
-
-import "errors"
-
-// readMemInfo is not supported on platforms other than linux and windows.
-func readMemInfo() (*Memory, error) {
-	return nil, errors.New("platform and architecture is not supported")
-}
@@ -1,45 +0,0 @@
-package meminfo
-
-import (
-	"unsafe"
-
-	"golang.org/x/sys/windows"
-)
-
-var (
-	modkernel32 = windows.NewLazySystemDLL("kernel32.dll")
-
-	procGlobalMemoryStatusEx = modkernel32.NewProc("GlobalMemoryStatusEx")
-)
-
-// https://msdn.microsoft.com/en-us/library/windows/desktop/aa366589(v=vs.85).aspx
-// https://msdn.microsoft.com/en-us/library/windows/desktop/aa366770(v=vs.85).aspx
-type memorystatusex struct {
-	dwLength                uint32
-	dwMemoryLoad            uint32
-	ullTotalPhys            uint64
-	ullAvailPhys            uint64
-	ullTotalPageFile        uint64
-	ullAvailPageFile        uint64
-	ullTotalVirtual         uint64
-	ullAvailVirtual         uint64
-	ullAvailExtendedVirtual uint64
-}
-
-// readMemInfo retrieves memory statistics of the host system and returns a
-// Memory type.
-func readMemInfo() (*Memory, error) {
-	msi := &memorystatusex{
-		dwLength: 64,
-	}
-	r1, _, _ := procGlobalMemoryStatusEx.Call(uintptr(unsafe.Pointer(msi)))
-	if r1 == 0 {
-		return &Memory{}, nil
-	}
-	return &Memory{
-		MemTotal:  int64(msi.ullTotalPhys),
-		MemFree:   int64(msi.ullAvailPhys),
-		SwapTotal: int64(msi.ullTotalPageFile),
-		SwapFree:  int64(msi.ullAvailPageFile),
-	}, nil
-}
@@ -1,3 +0,0 @@
-// Package process provides a set of basic functions to manage individual
-// processes.
-package process
@@ -1,82 +0,0 @@
-//go:build !windows
-// +build !windows
-
-package process
-
-import (
-	"bytes"
-	"fmt"
-	"os"
-	"path/filepath"
-	"runtime"
-	"strconv"
-
-	"golang.org/x/sys/unix"
-)
-
-// Alive returns true if process with a given pid is running. It only considers
-// positive PIDs; 0 (all processes in the current process group), -1 (all processes
-// with a PID larger than 1), and negative (-n, all processes in process group
-// "n") values for pid are never considered to be alive.
-func Alive(pid int) bool {
-	if pid < 1 {
-		return false
-	}
-	switch runtime.GOOS {
-	case "darwin":
-		// OS X does not have a proc filesystem. Use kill -0 pid to judge if the
-		// process exists. From KILL(2): https://www.freebsd.org/cgi/man.cgi?query=kill&sektion=2&manpath=OpenDarwin+7.2.1
-		//
-		// Sig may be one of the signals specified in sigaction(2) or it may
-		// be 0, in which case error checking is performed but no signal is
-		// actually sent. This can be used to check the validity of pid.
-		err := unix.Kill(pid, 0)
-
-		// Either the PID was found (no error) or we get an EPERM, which means
-		// the PID exists, but we don't have permissions to signal it.
-		return err == nil || err == unix.EPERM
-	default:
-		_, err := os.Stat(filepath.Join("/proc", strconv.Itoa(pid)))
-		return err == nil
-	}
-}
-
-// Kill force-stops a process. It only considers positive PIDs; 0 (all processes
-// in the current process group), -1 (all processes with a PID larger than 1),
-// and negative (-n, all processes in process group "n") values for pid are
-// ignored. Refer to [KILL(2)] for details.
-//
-// [KILL(2)]: https://man7.org/linux/man-pages/man2/kill.2.html
-func Kill(pid int) error {
-	if pid < 1 {
-		return fmt.Errorf("invalid PID (%d): only positive PIDs are allowed", pid)
-	}
-	err := unix.Kill(pid, unix.SIGKILL)
-	if err != nil && err != unix.ESRCH {
-		return err
-	}
-	return nil
-}
-
-// Zombie return true if process has a state with "Z". It only considers positive
-// PIDs; 0 (all processes in the current process group), -1 (all processes with
-// a PID larger than 1), and negative (-n, all processes in process group "n")
-// values for pid are ignored. Refer to [PROC(5)] for details.
-//
-// [PROC(5)]: https://man7.org/linux/man-pages/man5/proc.5.html
-func Zombie(pid int) (bool, error) {
-	if pid < 1 {
-		return false, nil
-	}
-	data, err := os.ReadFile(fmt.Sprintf("/proc/%d/stat", pid))
-	if err != nil {
-		if os.IsNotExist(err) {
-			return false, nil
-		}
-		return false, err
-	}
-	if cols := bytes.SplitN(data, []byte(" "), 4); len(cols) >= 3 && string(cols[2]) == "Z" {
-		return true, nil
-	}
-	return false, nil
-}
@@ -1,52 +0,0 @@
-package process
-
-import (
-	"os"
-
-	"golang.org/x/sys/windows"
-)
-
-// Alive returns true if process with a given pid is running.
-func Alive(pid int) bool {
-	h, err := windows.OpenProcess(windows.PROCESS_QUERY_LIMITED_INFORMATION, false, uint32(pid))
-	if err != nil {
-		return false
-	}
-	var c uint32
-	err = windows.GetExitCodeProcess(h, &c)
-	_ = windows.CloseHandle(h)
-	if err != nil {
-		// From the GetExitCodeProcess function (processthreadsapi.h) API docs:
-		// https://learn.microsoft.com/en-us/windows/win32/api/processthreadsapi/nf-processthreadsapi-getexitcodeprocess
-		//
-		// The GetExitCodeProcess function returns a valid error code defined by the
-		// application only after the thread terminates. Therefore, an application should
-		// not use STILL_ACTIVE (259) as an error code (STILL_ACTIVE is a macro for
-		// STATUS_PENDING (minwinbase.h)). If a thread returns STILL_ACTIVE (259) as
-		// an error code, then applications that test for that value could interpret it
-		// to mean that the thread is still running, and continue to test for the
-		// completion of the thread after the thread has terminated, which could put
-		// the application into an infinite loop.
-		return c == uint32(windows.STATUS_PENDING)
-	}
-	return true
-}
-
-// Kill force-stops a process.
-func Kill(pid int) error {
-	p, err := os.FindProcess(pid)
-	if err == nil {
-		err = p.Kill()
-		if err != nil && err != os.ErrProcessDone {
-			return err
-		}
-	}
-	return nil
-}
-
-// Zombie is not supported on Windows.
-//
-// TODO(thaJeztah): remove once we remove the stubs from pkg/system.
-func Zombie(_ int) (bool, error) {
-	return false, nil
-}
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows

 package system // import "github.com/docker/docker/pkg/system"

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows

 package system // import "github.com/docker/docker/pkg/system"

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows

 package system // import "github.com/docker/docker/pkg/system"

@@ -1,16 +0,0 @@
-package system
-
-import "github.com/docker/docker/pkg/meminfo"
-
-// MemInfo contains memory statistics of the host system.
-//
-// Deprecated: use [meminfo.Memory].
-type MemInfo = meminfo.Memory
-
-// ReadMemInfo retrieves memory statistics of the host system and returns a
-// MemInfo type.
-//
-// Deprecated: use [meminfo.Read].
-func ReadMemInfo() (*meminfo.Memory, error) {
-	return meminfo.Read()
-}
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows

 package system // import "github.com/docker/docker/pkg/system"

@@ -1,5 +1,4 @@
 //go:build freebsd
-// +build freebsd

 package system // import "github.com/docker/docker/pkg/system"

@@ -1,5 +1,4 @@
 //go:build !freebsd && !windows
-// +build !freebsd,!windows

 package system // import "github.com/docker/docker/pkg/system"

@@ -1,18 +0,0 @@
-package system
-
-const defaultUnixPathEnv = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-
-// DefaultPathEnv is unix style list of directories to search for
-// executables. Each directory is separated from the next by a colon
-// ':' character .
-// For Windows containers, an empty string is returned as the default
-// path will be set by the container, and Docker has no context of what the
-// default path should be.
-//
-// Deprecated: use oci.DefaultPathEnv
-func DefaultPathEnv(os string) string {
-	if os == "windows" {
-		return ""
-	}
-	return defaultUnixPathEnv
-}
@@ -1,27 +0,0 @@
-//go:build linux || freebsd || darwin || windows
-// +build linux freebsd darwin windows
-
-package system
-
-import "github.com/docker/docker/pkg/process"
-
-var (
-	// IsProcessAlive returns true if process with a given pid is running.
-	//
-	// Deprecated: use [process.Alive].
-	IsProcessAlive = process.Alive
-
-	// IsProcessZombie return true if process has a state with "Z"
-	//
-	// Deprecated: use [process.Zombie].
-	//
-	// TODO(thaJeztah): remove the Windows implementation in process once we remove this stub.
-	IsProcessZombie = process.Zombie
-)
-
-// KillProcess force-stops a process.
-//
-// Deprecated: use [process.Kill].
-func KillProcess(pid int) {
-	_ = process.Kill(pid)
-}
@@ -1,5 +1,4 @@
 //go:build freebsd || netbsd
-// +build freebsd netbsd

 package system // import "github.com/docker/docker/pkg/system"

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows

 package system // import "github.com/docker/docker/pkg/system"

@@ -1,5 +1,4 @@
 //go:build linux || freebsd
-// +build linux freebsd

 package system // import "github.com/docker/docker/pkg/system"

@@ -1,5 +1,4 @@
 //go:build !linux && !freebsd
-// +build !linux,!freebsd

 package system // import "github.com/docker/docker/pkg/system"

@@ -1,11 +1,19 @@
 package system // import "github.com/docker/docker/pkg/system"

-import "golang.org/x/sys/unix"
+import (
+	"io/fs"
+
+	"golang.org/x/sys/unix"
+)

 // Lgetxattr retrieves the value of the extended attribute identified by attr
 // and associated with the given path in the file system.
 // It will returns a nil slice and nil error if the xattr is not set.
 func Lgetxattr(path string, attr string) ([]byte, error) {
+	pathErr := func(err error) ([]byte, error) {
+		return nil, &fs.PathError{Op: "lgetxattr", Path: path, Err: err}
+	}
+
 	// Start with a 128 length byte array
 	dest := make([]byte, 128)
 	sz, errno := unix.Lgetxattr(path, attr, dest)
@@ -14,7 +22,7 @@ func Lgetxattr(path string, attr string) ([]byte, error) {
 		// Buffer too small, use zero-sized buffer to get the actual size
 		sz, errno = unix.Lgetxattr(path, attr, []byte{})
 		if errno != nil {
-			return nil, errno
+			return pathErr(errno)
 		}
 		dest = make([]byte, sz)
 		sz, errno = unix.Lgetxattr(path, attr, dest)
@@ -24,7 +32,7 @@ func Lgetxattr(path string, attr string) ([]byte, error) {
 	case errno == unix.ENODATA:
 		return nil, nil
 	case errno != nil:
-		return nil, errno
+		return pathErr(errno)
 	}

 	return dest[:sz], nil
@@ -33,5 +41,9 @@ func Lgetxattr(path string, attr string) ([]byte, error) {
 // Lsetxattr sets the value of the extended attribute identified by attr
 // and associated with the given path in the file system.
 func Lsetxattr(path string, attr string, data []byte, flags int) error {
-	return unix.Lsetxattr(path, attr, data, flags)
+	err := unix.Lsetxattr(path, attr, data, flags)
+	if err != nil {
+		return &fs.PathError{Op: "lsetxattr", Path: path, Err: err}
+	}
+	return nil
 }
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux

 package system // import "github.com/docker/docker/pkg/system"