forked from docker/cli
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix psFormat's Size handling in config file
- do an early check if a custom format is specified either through the command-line, or through the cli's configuration, before adjusting the options (to add "size" if needed). - also removes a redundant `options.Size = opts.size` line, as this value is already copied at the start of buildContainerListOptions() - Update NewContainerFormat to use "table" format as a default if no format was given. Co-authored-by: Sebastiaan van Stijn <github@gone.nl> Signed-off-by: Phong Tran <tran.pho@northeastern.edu>
- Loading branch information
Showing
5 changed files
with
24 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
cli/command/container/testdata/container-list-with-config-format.golden
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
c1 busybox:latest some.label=value | ||
c2 busybox:latest foo=bar | ||
c1 busybox:latest some.label=value 10.7MB | ||
c2 busybox:latest foo=bar 3.2MB |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters