Windows: Report Version and UBR #36451
Conversation
Codecov Report
@@ Coverage Diff @@
## master #36451 +/- ##
=========================================
Coverage ? 34.63%
=========================================
Files ? 613
Lines ? 45385
Branches ? 0
=========================================
Hits ? 15721
Misses ? 27602
Partials ? 2062 |
| return ret, err | ||
| } | ||
| ret = windows.UTF16ToString(buf[:]) | ||
| ret = fmt.Sprintf("%s, Update Build Revision %d", ret, ubr) |
There was a problem hiding this comment.
The format looks okay, and should look like this for Windows Server 1709:
Windows Server Standard Version 1709, Update Build Revision 248
However, did you consider something more consistent with winver.exe?
Windows Server Standard Version 1709 (OS Build 16299.248)
There was a problem hiding this comment.
Sure updated.
Client (RS4 Pre-release)
Swarm: inactive
Default Isolation: hyperv
Kernel Version: 10.0 17114 (17114.1000.amd64fre.rs4_release_base.180301-1503)
Operating System: Windows 10 Enterprise Insider Preview Version 1803 (OS Build 17114.1000)
OSType: windows
Architecture: x86_64
CPUs: 8
Total Memory: 15.93GiB
There was a problem hiding this comment.
And server RS3
Default Isolation: process
Kernel Version: 10.0 16299 (16299.248.amd64fre.rs3_release_svc_escrow.180209-1727)
Operating System: Windows Server Datacenter Version 1709 (OS Build 16299.248)
OSType: windows
Architecture: x86_64
CPUs: 32
Total Memory: 16.01GiB
| 0, | ||
| windows.KEY_READ, | ||
| &h); err != nil { | ||
| k, err := registry.OpenKey(registry.LOCAL_MACHINE, `SOFTWARE\Microsoft\WIndows NT\CurrentVersion`, registry.QUERY_VALUE) |
There was a problem hiding this comment.
Should pkg/parsers/kernel/ also be updated to use the registry package?
moby/pkg/parsers/kernel/kernel_windows.go
Lines 33 to 53 in 4f0d95f
There was a problem hiding this comment.
Sure but orthogonal to this PR itself. Can be addressed as a follow-up
There was a problem hiding this comment.
oh, definitely not needed in this PR 👍
|
Actually, let's move this back to design review for a bit, so that we can discuss @johnstep's suggestion for the format #36451 (comment) |
Signed-off-by: John Howard <jhoward@microsoft.com>
Signed-off-by: John Howard jhoward@microsoft.com
@johnstep as talked about offline. Reports back the ReleaseID (aka Version) and UBR in the operating system string reported by Docker Info. Also switches this to use the golang built in registry reader rather than direct API while I was there.