Skip to content

Commit

Permalink
Merge pull request #4509 from thaJeztah/23.0_backport_lazy_ping
Browse files Browse the repository at this point in the history
[23.0 backport] cmd/docker: areFlagsSupported: don't Ping if not needed
  • Loading branch information
thaJeztah committed Aug 23, 2023
2 parents 68f7636 + 35b5ac3 commit 7e32d44
Showing 1 changed file with 11 additions and 3 deletions.
14 changes: 11 additions & 3 deletions cmd/docker/docker.go
Original file line number Diff line number Diff line change
Expand Up @@ -402,14 +402,22 @@ func areFlagsSupported(cmd *cobra.Command, details versionDetails) error {
errs := []string{}

cmd.Flags().VisitAll(func(f *pflag.Flag) {
if !f.Changed {
if !f.Changed || len(f.Annotations) == 0 {
return
}
if !isVersionSupported(f, details.CurrentVersion()) {
// Important: in the code below, calls to "details.CurrentVersion()" and
// "details.ServerInfo()" are deliberately executed inline to make them
// be executed "lazily". This is to prevent making a connection with the
// daemon to perform a "ping" (even for flags that do not require a
// daemon connection).
//
// See commit b39739123b845f872549e91be184cc583f5b387c for details.

if _, ok := f.Annotations["version"]; ok && !isVersionSupported(f, details.CurrentVersion()) {
errs = append(errs, fmt.Sprintf(`"--%s" requires API version %s, but the Docker daemon API version is %s`, f.Name, getFlagAnnotation(f, "version"), details.CurrentVersion()))
return
}
if !isOSTypeSupported(f, details.ServerInfo().OSType) {
if _, ok := f.Annotations["ostype"]; ok && !isOSTypeSupported(f, details.ServerInfo().OSType) {
errs = append(errs, fmt.Sprintf(
`"--%s" is only supported on a Docker daemon running on %s, but the Docker daemon is running on %s`,
f.Name,
Expand Down

0 comments on commit 7e32d44

Please sign in to comment.