mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
0380fbff37
Signed-off-by: John Howard <jhoward@microsoft.com> This PR has the API changes described in https://github.com/moby/moby/issues/34617. Specifically, it adds an HTTP header "X-Requested-Platform" which is a JSON-encoded OCI Image-spec `Platform` structure. In addition, it renames (almost all) uses of a string variable platform (and associated) methods/functions to os. This makes it much clearer to disambiguate with the swarm "platform" which is really os/arch. This is a stepping stone to getting the daemon towards fully multi-platform/arch-aware, and makes it clear when "operating system" is being referred to rather than "platform" which is misleadingly used - sometimes in the swarm meaning, but more often as just the operating system.
60 lines
2 KiB
Go
60 lines
2 KiB
Go
package system
|
|
|
|
import (
|
|
"fmt"
|
|
"path/filepath"
|
|
"runtime"
|
|
"strings"
|
|
|
|
"github.com/containerd/continuity/pathdriver"
|
|
)
|
|
|
|
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 .
|
|
func DefaultPathEnv(os string) string {
|
|
if runtime.GOOS == "windows" {
|
|
if os != runtime.GOOS {
|
|
return defaultUnixPathEnv
|
|
}
|
|
// Deliberately empty on Windows containers on Windows as the default path will be set by
|
|
// the container. Docker has no context of what the default path should be.
|
|
return ""
|
|
}
|
|
return defaultUnixPathEnv
|
|
|
|
}
|
|
|
|
// CheckSystemDriveAndRemoveDriveLetter verifies that a path, if it includes a drive letter,
|
|
// is the system drive.
|
|
// On Linux: this is a no-op.
|
|
// On Windows: this does the following>
|
|
// CheckSystemDriveAndRemoveDriveLetter verifies and manipulates a Windows path.
|
|
// This is used, for example, when validating a user provided path in docker cp.
|
|
// If a drive letter is supplied, it must be the system drive. The drive letter
|
|
// is always removed. Also, it translates it to OS semantics (IOW / to \). We
|
|
// need the path in this syntax so that it can ultimately be contatenated with
|
|
// a Windows long-path which doesn't support drive-letters. Examples:
|
|
// C: --> Fail
|
|
// C:\ --> \
|
|
// a --> a
|
|
// /a --> \a
|
|
// d:\ --> Fail
|
|
func CheckSystemDriveAndRemoveDriveLetter(path string, driver pathdriver.PathDriver) (string, error) {
|
|
if runtime.GOOS != "windows" || LCOWSupported() {
|
|
return path, nil
|
|
}
|
|
|
|
if len(path) == 2 && string(path[1]) == ":" {
|
|
return "", fmt.Errorf("No relative path specified in %q", path)
|
|
}
|
|
if !driver.IsAbs(path) || len(path) < 2 {
|
|
return filepath.FromSlash(path), nil
|
|
}
|
|
if string(path[1]) == ":" && !strings.EqualFold(string(path[0]), "c") {
|
|
return "", fmt.Errorf("The specified path is not on the system drive (C:)")
|
|
}
|
|
return filepath.FromSlash(path[2:]), nil
|
|
}
|