Fix psFormat's Size handling in config file#3640
Merged
thaJeztah merged 1 commit intodocker:masterfrom Jun 7, 2022
Merged
Conversation
Codecov Report
@@ Coverage Diff @@
## master #3640 +/- ##
==========================================
- Coverage 59.01% 59.00% -0.01%
==========================================
Files 287 287
Lines 24622 24635 +13
==========================================
+ Hits 14530 14537 +7
- Misses 9218 9222 +4
- Partials 874 876 +2 |
Contributor
Author
|
@thaJeztah thanks for merging my deflake PR the other day! Can you review this one as well? |
thaJeztah
reviewed
Jun 6, 2022
thaJeztah
reviewed
Jun 6, 2022
Contributor
Author
|
@thaJeztah looks like we're all set to merge! Thank you for working on this with me 😄 I learned a lot in the process! |
Member
|
Awesome! Changes look good 😅 - let me do a quick rebase and squash |
- 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>
thaJeztah
force-pushed
the
3632-fix-ps-format
branch
from
d376a19 to
0929bed
Compare
Member
|
CI is happy as well; let's bring this one in 👍 |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
- What I did
docker psusingpsFormatin config that containsSizedoes not behave as expected #3632- How I did it
Sizeusage in config file'sPsFormat, and moved this logic before callingcontainerListWithSizefunction in test builder to allow specifying container size in unit testsTestContainerListWithConfigFormatto test for changes above- How to verify it
Run the full test suite via
docker buildx bake test, then attempt to reproduce issue above- Description for the changelog
Fixed incorrect size handling in config file when using docker ps
- A picture of a cute animal (not mandatory but encouraged)
