From 53d6aadda5f5bef3af7fb1f9362dbd81189e8374 Mon Sep 17 00:00:00 2001 From: "John Howard (VM)" Date: Tue, 21 Mar 2017 10:02:16 -0700 Subject: [PATCH] Windows: Remove --credentialspec flag Signed-off-by: John Howard (VM) --- cli/command/container/opts.go | 3 --- contrib/completion/bash/docker | 1 - 2 files changed, 4 deletions(-) diff --git a/cli/command/container/opts.go b/cli/command/container/opts.go index febddbc5d1..73cde873b4 100644 --- a/cli/command/container/opts.go +++ b/cli/command/container/opts.go @@ -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)") diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker index 9cf46ae7d4..e2db1de281 100644 --- a/contrib/completion/bash/docker +++ b/contrib/completion/bash/docker @@ -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