Fix nerdctl info on Windows #3158
Merged
Conversation
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
|
What was the issue on Windows? |
@AkihiroSuda Filed a bug #3160 |
TinaMor
force-pushed
the
tinamor/dev
branch
2 times, most recently
from
1389735 to
4b476c4
Compare
AkihiroSuda
reviewed
Jul 3, 2024
AkihiroSuda
reviewed
Jul 3, 2024
jsturtevant
reviewed
Jul 3, 2024
TinaMor
force-pushed
the
tinamor/dev
branch
6 times, most recently
from
50b4b1e to
8e3cb73
Compare
jsturtevant
reviewed
Jul 8, 2024
| @@ -153,13 +153,45 @@ func prettyPrintInfoDockerCompat(stdout io.Writer, stderr io.Writer, info *docke | |||
| // Storage Driver is not really Server concept for nerdctl, but mimics `docker info` output | |||
| fmt.Fprintf(w, " Storage Driver: %s\n", info.Driver) | |||
| fmt.Fprintf(w, " Logging Driver: %s\n", info.LoggingDriver) | |||
| fmt.Fprintf(w, " Cgroup Driver: %s\n", info.CgroupDriver) | |||
| fmt.Fprintf(w, " Cgroup Version: %s\n", info.CgroupVersion) | |||
| printF(w, " Cgroup Driver: ", info.CgroupDriver) | |||
There was a problem hiding this comment.
Extra space?
there isn't anything particular wrong with this but it might be simpler to either to print blank or wrap it like info.warnings below:
if info.CgroupDriver != "" { fmt.Fprintf(w, " Cgroup Driver: %s\n",, CgroupDriver ) }
| fmt.Fprintf(w, " %s: %s\n", label, dockerCompatInfo) | ||
| } | ||
|
|
||
| func printSecurityOptions(w io.Writer, securityOptions []string) { |
There was a problem hiding this comment.
Same comment here to match what is done with warnings i.e if (len(securityoptions) > 0) ....
| @@ -175,21 +207,7 @@ func prettyPrintInfoDockerCompat(stdout io.Writer, stderr io.Writer, info *docke | |||
| if k == "name" { | |||
| continue | |||
| } | |||
| fmt.Fprintf(w, " %s: %s\n", cases.Title(language.English).String(k), v) | |||
| fmt.Fprintf(w, " %s:\t%s\n", cases.Title(language.English).String(k), v) | |||
There was a problem hiding this comment.
should the tab be here? I don't see it used in rest of the print statements
Signed-off-by: Tina Murimi <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 does this PR do?
The nerdctl info command currently lacks certain information specific to the Windows OS. The necessary methods to retrieve this information are not yet implemented.
infoutil_windows.go#L29-L36C2
This PR aims to address the missing Windows OS-specific information in the nerdctl info command by implementing the required methods.
Bug reference:
Bug #3160 Windows system information missing in "nerdctl info"