51a6c88912
This fixes the hard coded restriction for non-linux platforms to v2 registries. Previously, the check was above the flag parsing, which would overwrite the hard coded value and prevent correct operation. This change also removes the related daemon flag from Windows to avoid confusion, as it has no meaning when the value is going to always be hard coded to true. Signed-off-by: Stefan J. Wernli <swernli@microsoft.com> Upstream-commit: adee28458c23581ac9afb163b7cce8c6bb1d2dee Component: engine
26 lines
819 B
Go
26 lines
819 B
Go
package registry
|
|
|
|
import (
|
|
"os"
|
|
"path/filepath"
|
|
"strings"
|
|
|
|
flag "github.com/docker/docker/pkg/mflag"
|
|
)
|
|
|
|
// CertsDir is the directory where certificates are stored
|
|
var CertsDir = os.Getenv("programdata") + `\docker\certs.d`
|
|
|
|
// cleanPath is used to ensure that a directory name is valid on the target
|
|
// platform. It will be passed in something *similar* to a URL such as
|
|
// 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))
|
|
}
|
|
|
|
// installCliPlatformFlags handles any platform specific flags for the service.
|
|
func (options *ServiceOptions) installCliPlatformFlags(cmd *flag.FlagSet, usageFn func(string) string) {
|
|
// No Windows specific flags.
|
|
}
|