mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Merge pull request #29244 from yuexiao-wang/fix-typos-eg
Fix a bit typos
This commit is contained in:
commit
d1515a5264
9 changed files with 9 additions and 9 deletions
|
@ -3,6 +3,6 @@ package api
|
||||||
// MinVersion represents Minimum REST API version supported
|
// MinVersion represents Minimum REST API version supported
|
||||||
// Technically the first daemon API version released on Windows is v1.25 in
|
// Technically the first daemon API version released on Windows is v1.25 in
|
||||||
// engine version 1.13. However, some clients are explicitly using downlevel
|
// engine version 1.13. However, some clients are explicitly using downlevel
|
||||||
// APIs (eg docker-compose v2.1 file format) and that is just too restrictive.
|
// APIs (e.g. docker-compose v2.1 file format) and that is just too restrictive.
|
||||||
// Hence also allowing 1.24 on Windows.
|
// Hence also allowing 1.24 on Windows.
|
||||||
const MinVersion string = "1.24"
|
const MinVersion string = "1.24"
|
||||||
|
|
|
@ -317,7 +317,7 @@ type HostConfig struct {
|
||||||
|
|
||||||
// Applicable to Windows
|
// Applicable to Windows
|
||||||
ConsoleSize [2]uint // Initial console size (height,width)
|
ConsoleSize [2]uint // Initial console size (height,width)
|
||||||
Isolation Isolation // Isolation technology of the container (eg default, hyperv)
|
Isolation Isolation // Isolation technology of the container (e.g. default, hyperv)
|
||||||
|
|
||||||
// Contains container's resources (cgroups, ulimits)
|
// Contains container's resources (cgroups, ulimits)
|
||||||
Resources
|
Resources
|
||||||
|
|
|
@ -229,7 +229,7 @@ func (container *Container) SetupWorkingDirectory(rootUID, rootGID int) error {
|
||||||
|
|
||||||
container.Config.WorkingDir = filepath.Clean(container.Config.WorkingDir)
|
container.Config.WorkingDir = filepath.Clean(container.Config.WorkingDir)
|
||||||
|
|
||||||
// If can't mount container FS at this point (eg Hyper-V Containers on
|
// If can't mount container FS at this point (e.g. Hyper-V Containers on
|
||||||
// Windows) bail out now with no action.
|
// Windows) bail out now with no action.
|
||||||
if !container.canMountFS() {
|
if !container.canMountFS() {
|
||||||
return nil
|
return nil
|
||||||
|
|
|
@ -80,7 +80,7 @@ func init() {
|
||||||
containerStoragePath = strings.Replace(containerStoragePath, `/`, `\`, -1)
|
containerStoragePath = strings.Replace(containerStoragePath, `/`, `\`, -1)
|
||||||
// On Windows, extract out the version as we need to make selective
|
// On Windows, extract out the version as we need to make selective
|
||||||
// decisions during integration testing as and when features are implemented.
|
// decisions during integration testing as and when features are implemented.
|
||||||
// eg in "10.0 10550 (10550.1000.amd64fre.branch.date-time)" we want 10550
|
// e.g. in "10.0 10550 (10550.1000.amd64fre.branch.date-time)" we want 10550
|
||||||
windowsDaemonKV, _ = strconv.Atoi(strings.Split(info.KernelVersion, " ")[1])
|
windowsDaemonKV, _ = strconv.Atoi(strings.Split(info.KernelVersion, " ")[1])
|
||||||
} else {
|
} else {
|
||||||
volumesConfigPath = strings.Replace(volumesConfigPath, `\`, `/`, -1)
|
volumesConfigPath = strings.Replace(volumesConfigPath, `\`, `/`, -1)
|
||||||
|
|
|
@ -661,7 +661,7 @@ func TarWithOptions(srcPath string, options *TarOptions) (io.ReadCloser, error)
|
||||||
if skip {
|
if skip {
|
||||||
// If we want to skip this file and its a directory
|
// If we want to skip this file and its a directory
|
||||||
// then we should first check to see if there's an
|
// then we should first check to see if there's an
|
||||||
// excludes pattern (eg !dir/file) that starts with this
|
// excludes pattern (e.g. !dir/file) that starts with this
|
||||||
// dir. If so then we can't skip this dir.
|
// dir. If so then we can't skip this dir.
|
||||||
|
|
||||||
// Its not a dir then so we can just return/skip.
|
// Its not a dir then so we can just return/skip.
|
||||||
|
|
|
@ -42,7 +42,7 @@ type ServerHeader struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
// ParseServerHeader extracts pieces from an HTTP server header
|
// ParseServerHeader extracts pieces from an HTTP server header
|
||||||
// which is in the format "docker/version (os)" eg docker/1.8.0-dev (windows).
|
// which is in the format "docker/version (os)" e.g. docker/1.8.0-dev (windows).
|
||||||
func ParseServerHeader(hdr string) (*ServerHeader, error) {
|
func ParseServerHeader(hdr string) (*ServerHeader, error) {
|
||||||
matches := headerRegexp.FindStringSubmatch(hdr)
|
matches := headerRegexp.FindStringSubmatch(hdr)
|
||||||
if len(matches) != 4 {
|
if len(matches) != 4 {
|
||||||
|
|
|
@ -21,7 +21,7 @@ const allowV1PluginsFallback bool = true
|
||||||
|
|
||||||
/* defaultAPIVersion is the version of the plugin API for volume, network,
|
/* defaultAPIVersion is the version of the plugin API for volume, network,
|
||||||
IPAM and authz. This is a very stable API. When we update this API, then
|
IPAM and authz. This is a very stable API. When we update this API, then
|
||||||
pluginType should include a version. eg "networkdriver/2.0".
|
pluginType should include a version. e.g. "networkdriver/2.0".
|
||||||
*/
|
*/
|
||||||
const defaultAPIVersion string = "1.0"
|
const defaultAPIVersion string = "1.0"
|
||||||
|
|
||||||
|
|
|
@ -336,7 +336,7 @@ func compareRandomizedStrings(a, b, c, d string) error {
|
||||||
// setupPlatformVolume takes two arrays of volume specs - a Unix style
|
// setupPlatformVolume takes two arrays of volume specs - a Unix style
|
||||||
// spec and a Windows style spec. Depending on the platform being unit tested,
|
// spec and a Windows style spec. Depending on the platform being unit tested,
|
||||||
// it returns one of them, along with a volume string that would be passed
|
// it returns one of them, along with a volume string that would be passed
|
||||||
// on the docker CLI (eg -v /bar -v /foo).
|
// on the docker CLI (e.g. -v /bar -v /foo).
|
||||||
func setupPlatformVolume(u []string, w []string) ([]string, string) {
|
func setupPlatformVolume(u []string, w []string) ([]string, string) {
|
||||||
var a []string
|
var a []string
|
||||||
if runtime.GOOS == "windows" {
|
if runtime.GOOS == "windows" {
|
||||||
|
|
|
@ -216,7 +216,7 @@ func ParseMountRaw(raw, volumeDriver string) (*MountPoint, error) {
|
||||||
case 2:
|
case 2:
|
||||||
if ValidMountMode(arr[1]) {
|
if ValidMountMode(arr[1]) {
|
||||||
// Destination + Mode is not a valid volume - volumes
|
// Destination + Mode is not a valid volume - volumes
|
||||||
// cannot include a mode. eg /foo:rw
|
// cannot include a mode. e.g. /foo:rw
|
||||||
return nil, errInvalidSpec(raw)
|
return nil, errInvalidSpec(raw)
|
||||||
}
|
}
|
||||||
// Host Source Path or Name + Destination
|
// Host Source Path or Name + Destination
|
||||||
|
|
Loading…
Reference in a new issue