Merge pull request #6667 from thaJeztah/use_format

image ls: allow custom format in cli config
Merge pull request #6668 from robmry/builttime-format
2025-11-20 16:31:07 +00:00 · 2025-11-20 16:21:40 +00:00 · 2025-11-20 16:20:33 +00:00 · 2025-11-20 15:57:24 +00:00
6 changed files with 14 additions and 14 deletions
--- a/cli/command/image/list.go
+++ b/cli/command/image/list.go
@ -114,6 +114,16 @@ func runImages(ctx context.Context, dockerCLI command.Cli, options imagesOptions
 		}
 	}

+	format := options.format
+	if len(format) == 0 {
+		if len(dockerCLI.ConfigFile().ImagesFormat) > 0 && !options.quiet && !options.tree {
+			format = dockerCLI.ConfigFile().ImagesFormat
+			useTree = false
+		} else {
+			format = formatter.TableFormatKey
+		}
+	}
+
 	if useTree {
 		return runTree(ctx, dockerCLI, treeOptions{
 			images:   images,
@ -123,15 +133,6 @@ func runImages(ctx context.Context, dockerCLI command.Cli, options imagesOptions
 		})
 	}

-	format := options.format
-	if len(format) == 0 {
-		if len(dockerCLI.ConfigFile().ImagesFormat) > 0 && !options.quiet {
-			format = dockerCLI.ConfigFile().ImagesFormat
-		} else {
-			format = formatter.TableFormatKey
-		}
-	}
-
 	imageCtx := formatter.ImageContext{
 		Context: formatter.Context{
 			Output: dockerCLI.Out(),
--- a/cli/command/image/testdata/list-command-success.format.golden
+++ b/cli/command/image/testdata/list-command-success.format.golden
@ -1 +0,0 @@
-IMAGE   ID             DISK USAGE   CONTENT SIZE   EXTRA
--- a/cli/command/system/testdata/TestVersionFormat/json.golden
+++ b/cli/command/system/testdata/TestVersionFormat/json.golden
@ -1 +1 @@
-{"Client":{"Version":"18.99.5-ce","ApiVersion":"1.38","DefaultAPIVersion":"1.38","GitCommit":"deadbeef","GoVersion":"go1.10.2","Os":"linux","Arch":"amd64","BuildTime":"Wed May 30 22:21:05 2018","Context":"my-context"},"Server":{"Platform":{"Name":"Docker Enterprise Edition (EE) 2.0"},"Version":"18.99.5-ce","ApiVersion":"1.30","MinAPIVersion":"1.12","Os":"linux","Arch":"amd64","Components":[{"Name":"Engine","Version":"17.06.2-ee-15","Details":{"ApiVersion":"1.30","Arch":"amd64","BuildTime":"Mon Jul  9 23:38:38 2018","Experimental":"false","GitCommit":"64ddfa6","GoVersion":"go1.8.7","MinAPIVersion":"1.12","Os":"linux"}},{"Name":"Universal Control Plane","Version":"17.06.2-ee-15","Details":{"ApiVersion":"1.30","Arch":"amd64","BuildTime":"Mon Jul  2 21:24:07 UTC 2018","GitCommit":"4513922","GoVersion":"go1.9.4","MinApiVersion":"1.20","Os":"linux","Version":"3.0.3-tp2"}},{"Name":"Kubernetes","Version":"1.8+","Details":{"buildDate":"2018-04-26T16:51:21Z","compiler":"gc","gitCommit":"8d637aedf46b9c21dde723e29c645b9f27106fa5","gitTreeState":"clean","gitVersion":"v1.8.11-docker-8d637ae","goVersion":"go1.8.3","major":"1","minor":"8+","platform":"linux/amd64"}},{"Name":"Calico","Version":"v3.0.8","Details":{"cni":"v2.0.6","kube-controllers":"v2.0.5","node":"v3.0.8"}}],"GitCommit":"64ddfa6","GoVersion":"go1.8.7","KernelVersion":"v1.0.0","BuildTime":"Mon Jul  9 23:38:38 2018"}}
+{"Client":{"Version":"18.99.5-ce","ApiVersion":"1.38","DefaultAPIVersion":"1.38","GitCommit":"deadbeef","GoVersion":"go1.10.2","Os":"linux","Arch":"amd64","BuildTime":"Wed May 30 22:21:05 2018","Context":"my-context"},"Server":{"Platform":{"Name":"Docker Enterprise Edition (EE) 2.0"},"Version":"18.99.5-ce","ApiVersion":"1.30","MinAPIVersion":"1.12","Os":"linux","Arch":"amd64","Components":[{"Name":"Engine","Version":"17.06.2-ee-15","Details":{"ApiVersion":"1.30","Arch":"amd64","BuildTime":"Mon Jul  9 23:38:38 2018","Experimental":"false","GitCommit":"64ddfa6","GoVersion":"go1.8.7","MinAPIVersion":"1.12","Os":"linux"}},{"Name":"Universal Control Plane","Version":"17.06.2-ee-15","Details":{"ApiVersion":"1.30","Arch":"amd64","BuildTime":"Mon Jul  2 21:24:07 UTC 2018","GitCommit":"4513922","GoVersion":"go1.9.4","MinApiVersion":"1.20","Os":"linux","Version":"3.0.3-tp2"}},{"Name":"Kubernetes","Version":"1.8+","Details":{"buildDate":"2018-04-26T16:51:21Z","compiler":"gc","gitCommit":"8d637aedf46b9c21dde723e29c645b9f27106fa5","gitTreeState":"clean","gitVersion":"v1.8.11-docker-8d637ae","goVersion":"go1.8.3","major":"1","minor":"8+","platform":"linux/amd64"}},{"Name":"Calico","Version":"v3.0.8","Details":{"cni":"v2.0.6","kube-controllers":"v2.0.5","node":"v3.0.8"}}],"GitCommit":"64ddfa6","GoVersion":"go1.8.7","KernelVersion":"v1.0.0","BuildTime":"2018-07-09T22:38:38.000000000+00:00"}}
--- a/cli/command/system/testdata/TestVersionFormat/json_template.golden
+++ b/cli/command/system/testdata/TestVersionFormat/json_template.golden
@ -1 +1 @@
-{"Client":{"Version":"18.99.5-ce","ApiVersion":"1.38","DefaultAPIVersion":"1.38","GitCommit":"deadbeef","GoVersion":"go1.10.2","Os":"linux","Arch":"amd64","BuildTime":"Wed May 30 22:21:05 2018","Context":"my-context"},"Server":{"Platform":{"Name":"Docker Enterprise Edition (EE) 2.0"},"Version":"18.99.5-ce","ApiVersion":"1.30","MinAPIVersion":"1.12","Os":"linux","Arch":"amd64","Components":[{"Name":"Engine","Version":"17.06.2-ee-15","Details":{"ApiVersion":"1.30","Arch":"amd64","BuildTime":"Mon Jul  9 23:38:38 2018","Experimental":"false","GitCommit":"64ddfa6","GoVersion":"go1.8.7","MinAPIVersion":"1.12","Os":"linux"}},{"Name":"Universal Control Plane","Version":"17.06.2-ee-15","Details":{"ApiVersion":"1.30","Arch":"amd64","BuildTime":"Mon Jul  2 21:24:07 UTC 2018","GitCommit":"4513922","GoVersion":"go1.9.4","MinApiVersion":"1.20","Os":"linux","Version":"3.0.3-tp2"}},{"Name":"Kubernetes","Version":"1.8+","Details":{"buildDate":"2018-04-26T16:51:21Z","compiler":"gc","gitCommit":"8d637aedf46b9c21dde723e29c645b9f27106fa5","gitTreeState":"clean","gitVersion":"v1.8.11-docker-8d637ae","goVersion":"go1.8.3","major":"1","minor":"8+","platform":"linux/amd64"}},{"Name":"Calico","Version":"v3.0.8","Details":{"cni":"v2.0.6","kube-controllers":"v2.0.5","node":"v3.0.8"}}],"GitCommit":"64ddfa6","GoVersion":"go1.8.7","KernelVersion":"v1.0.0","BuildTime":"Mon Jul  9 23:38:38 2018"}}
+{"Client":{"Version":"18.99.5-ce","ApiVersion":"1.38","DefaultAPIVersion":"1.38","GitCommit":"deadbeef","GoVersion":"go1.10.2","Os":"linux","Arch":"amd64","BuildTime":"Wed May 30 22:21:05 2018","Context":"my-context"},"Server":{"Platform":{"Name":"Docker Enterprise Edition (EE) 2.0"},"Version":"18.99.5-ce","ApiVersion":"1.30","MinAPIVersion":"1.12","Os":"linux","Arch":"amd64","Components":[{"Name":"Engine","Version":"17.06.2-ee-15","Details":{"ApiVersion":"1.30","Arch":"amd64","BuildTime":"Mon Jul  9 23:38:38 2018","Experimental":"false","GitCommit":"64ddfa6","GoVersion":"go1.8.7","MinAPIVersion":"1.12","Os":"linux"}},{"Name":"Universal Control Plane","Version":"17.06.2-ee-15","Details":{"ApiVersion":"1.30","Arch":"amd64","BuildTime":"Mon Jul  2 21:24:07 UTC 2018","GitCommit":"4513922","GoVersion":"go1.9.4","MinApiVersion":"1.20","Os":"linux","Version":"3.0.3-tp2"}},{"Name":"Kubernetes","Version":"1.8+","Details":{"buildDate":"2018-04-26T16:51:21Z","compiler":"gc","gitCommit":"8d637aedf46b9c21dde723e29c645b9f27106fa5","gitTreeState":"clean","gitVersion":"v1.8.11-docker-8d637ae","goVersion":"go1.8.3","major":"1","minor":"8+","platform":"linux/amd64"}},{"Name":"Calico","Version":"v3.0.8","Details":{"cni":"v2.0.6","kube-controllers":"v2.0.5","node":"v3.0.8"}}],"GitCommit":"64ddfa6","GoVersion":"go1.8.7","KernelVersion":"v1.0.0","BuildTime":"2018-07-09T22:38:38.000000000+00:00"}}
--- a/cli/command/system/version.go
+++ b/cli/command/system/version.go
@ -151,7 +151,7 @@ func newServerVersion(sv client.ServerVersionResult) *serverVersion {
 			out.GoVersion = component.Details["GoVersion"]
 			out.KernelVersion = component.Details["KernelVersion"]
 			out.Experimental = func() bool { b, _ := strconv.ParseBool(component.Details["Experimental"]); return b }()
-			out.BuildTime = reformatDate(component.Details["BuildTime"])
+			out.BuildTime = buildTime
 		}
 		out.Components = append(out.Components, component)
 	}
--- a/cli/command/system/version_test.go
+++ b/cli/command/system/version_test.go
@ -58,7 +58,7 @@ func TestVersionFormat(t *testing.T) {
 			GoVersion:     "go1.8.7",
 			KernelVersion: "v1.0.0",
 			Experimental:  false,
-			BuildTime:     "Mon Jul  9 23:38:38 2018",
+			BuildTime:     "2018-07-09T22:38:38.000000000+00:00",
 			Components: []system.ComponentVersion{
 				{
 					Name:    "Engine",
Author	SHA1	Message	Date
Paweł Gronowski	511dad69d0	Merge pull request #6667 from thaJeztah/use_format Some checks failed build / prepare-plugins (push) Has been cancelled Details build / plugins (push) Has been cancelled Details codeql / codeql (push) Has been cancelled Details e2e / tests (alpine, 25, connhelper-ssh) (push) Has been cancelled Details e2e / tests (alpine, 25, local) (push) Has been cancelled Details e2e / tests (alpine, 27, connhelper-ssh) (push) Has been cancelled Details e2e / tests (alpine, 27, local) (push) Has been cancelled Details e2e / tests (alpine, 28, connhelper-ssh) (push) Has been cancelled Details e2e / tests (alpine, 28, local) (push) Has been cancelled Details e2e / tests (alpine, 29-rc, connhelper-ssh) (push) Has been cancelled Details e2e / tests (alpine, 29-rc, local) (push) Has been cancelled Details e2e / tests (debian, 25, connhelper-ssh) (push) Has been cancelled Details e2e / tests (debian, 25, local) (push) Has been cancelled Details e2e / tests (debian, 27, connhelper-ssh) (push) Has been cancelled Details e2e / tests (debian, 27, local) (push) Has been cancelled Details e2e / tests (debian, 28, connhelper-ssh) (push) Has been cancelled Details e2e / tests (debian, 28, local) (push) Has been cancelled Details e2e / tests (debian, 29-rc, connhelper-ssh) (push) Has been cancelled Details e2e / tests (debian, 29-rc, local) (push) Has been cancelled Details test / ctn (push) Has been cancelled Details test / host (macos-14) (push) Has been cancelled Details test / host (macos-15) (push) Has been cancelled Details test / host (macos-15-intel) (push) Has been cancelled Details validate / validate (lint) (push) Has been cancelled Details validate / validate (shellcheck) (push) Has been cancelled Details validate / validate (update-authors) (push) Has been cancelled Details validate / validate (validate-vendor) (push) Has been cancelled Details validate / validate-md (push) Has been cancelled Details validate / validate-make (manpages) (push) Has been cancelled Details validate / validate-make (yamldocs) (push) Has been cancelled Details image ls: allow custom format in cli config	2025-11-20 16:31:07 +00:00
Paweł Gronowski	11f24b8458	Merge pull request #6668 from robmry/builttime-format docker version: restore top-level BuildTime to RFC3339Nano format	2025-11-20 16:21:40 +00:00
Sebastiaan van Stijn	d84396d4eb	image ls: allow custom format in cli config Setting a custom format in the cli cofig should still be supported, and not produce an error when specifying "--tree". Specifyihg both "--tree" and "--format" still produces an error, but we could consider allowing "json" format in a future update. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2025-11-20 16:20:33 +00:00
Rob Murray	6751cd1690	docker version: restore top-level BuildTime to RFC3339Nano Introduced by `bff56f0` (cli/command/system: define struct for formatting version). In the "docker info" result, the Engine component's BuildTime should be in time.ANSIC format, but the top level BuildTime field should use time.RFC3339Nano. Signed-off-by: Rob Murray <rob.murray@docker.com>	2025-11-20 15:57:24 +00:00