Merge pull request #31976 from Microsoft/jjh/csbooboo

Windows: Remove --credentialspec flag
This commit is contained in:
Vincent Demeester 2017-03-26 12:44:27 +02:00 committed by GitHub
commit ab08a571d1
2 changed files with 0 additions and 4 deletions

View File

@ -115,7 +115,6 @@ type containerOptions struct {
autoRemove bool
init bool
initPath string
credentialSpec string
Image string
Args []string
@ -188,8 +187,6 @@ func addFlags(flags *pflag.FlagSet) *containerOptions {
flags.BoolVar(&copts.privileged, "privileged", false, "Give extended privileges to this container")
flags.Var(&copts.securityOpt, "security-opt", "Security Options")
flags.StringVar(&copts.usernsMode, "userns", "", "User namespace to use")
flags.StringVar(&copts.credentialSpec, "credentialspec", "", "Credential spec for managed service account (Windows only)")
flags.SetAnnotation("credentialspec", "ostype", []string{"windows"})
// Network and port publishing flag
flags.Var(&copts.extraHosts, "add-host", "Add a custom host-to-IP mapping (host:ip)")

View File

@ -1522,7 +1522,6 @@ _docker_container_run_and_create() {
__docker_daemon_os_is windows && options_with_args+="
--cpu-count
--cpu-percent
--credentialspec
--io-maxbandwidth
--io-maxiops
--isolation