containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add 'Os' to be queried via 'version' output 

Signed-off-by: John Matthews <jwmatthews@gmail.com>
This commit is contained in:
John Matthews 2022-03-29 17:37:27 -04:00
parent c319edaaf8
commit 1ffcc4a888
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libpod/define/version.go
View File

@ -27,6 +27,7 @@ type Version struct {
BuiltTime string BuiltTime string
Built int64 Built int64
OsArch string OsArch string
Os string
} }
// GetVersion returns a VersionOutput struct for API and podman // GetVersion returns a VersionOutput struct for API and podman
@ -49,5 +50,6 @@ func GetVersion() (Version, error) {
BuiltTime: time.Unix(buildTime, 0).Format(time.ANSIC), BuiltTime: time.Unix(buildTime, 0).Format(time.ANSIC),
Built: buildTime, Built: buildTime,
OsArch: runtime.GOOS + "/" + runtime.GOARCH, OsArch: runtime.GOOS + "/" + runtime.GOARCH,
Os: runtime.GOOS,
}, nil }, nil
} }

1
pkg/bindings/system/system.go
View File

@ -120,6 +120,7 @@ func Version(ctx context.Context, options *VersionOptions) (*entities.SystemVers
BuiltTime: time.Unix(b.Unix(), 0).Format(time.ANSIC), BuiltTime: time.Unix(b.Unix(), 0).Format(time.ANSIC),
Built: b.Unix(), Built: b.Unix(),
OsArch: fmt.Sprintf("%s/%s", component.Os, component.Arch), OsArch: fmt.Sprintf("%s/%s", component.Os, component.Arch),
Os: component.Os,
} }
for _, c := range component.Components { for _, c := range component.Components {

8
test/e2e/version_test.go
View File

@ -87,10 +87,18 @@ var _ = Describe("Podman version", func() {
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0)) Expect(session).Should(Exit(0))
session = podmanTest.Podman([]string{"version", "--format", "{{ .Client.Os }}"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
session = podmanTest.Podman([]string{"version", "--format", "{{ .Server.Version }}"}) session = podmanTest.Podman([]string{"version", "--format", "{{ .Server.Version }}"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0)) Expect(session).Should(Exit(0))
session = podmanTest.Podman([]string{"version", "--format", "{{ .Server.Os }}"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
session = podmanTest.Podman([]string{"version", "--format", "{{ .Version }}"}) session = podmanTest.Podman([]string{"version", "--format", "{{ .Version }}"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0)) Expect(session).Should(Exit(0))