opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-21 17:38:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5508 from baude/buildaddarchos

Browse Source 
add os|arch attributes when building
This commit is contained in:
OpenShift Merge Robot
2020-03-16 12:23:56 +01:00
committed by GitHub
parent 8b07ad1138 9ca4b6c6f5
commit af1ac85da6
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/podman/build.go
View File

@ -342,6 +342,7 @@ func buildCmd(c *cliconfig.BuildValues) error {
} }
options := imagebuildah.BuildOptions{ options := imagebuildah.BuildOptions{
Architecture: c.Arch,
CommonBuildOpts: &buildOpts, CommonBuildOpts: &buildOpts,
AdditionalTags: tags, AdditionalTags: tags,
Annotations: c.Annotation, Annotations: c.Annotation,
@ -359,6 +360,7 @@ func buildCmd(c *cliconfig.BuildValues) error {
Layers: layers, Layers: layers,
NamespaceOptions: nsValues, NamespaceOptions: nsValues,
NoCache: c.NoCache, NoCache: c.NoCache,
OS: c.OS,
Out: stdout, Out: stdout,
Output: output, Output: output,
OutputFormat: format, OutputFormat: format,

10
test/e2e/build_test.go
View File

@ -6,6 +6,7 @@ import (
"io/ioutil" "io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
"runtime"
"strings" "strings"
. "github.com/containers/libpod/test/utils" . "github.com/containers/libpod/test/utils"
@ -43,6 +44,15 @@ var _ = Describe("Podman build", func() {
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0)) Expect(session.ExitCode()).To(Equal(0))
iid := session.OutputToStringArray()[len(session.OutputToStringArray())-1]
// Verify that OS and Arch are being set
inspect := podmanTest.PodmanNoCache([]string{"inspect", iid})
inspect.WaitWithDefaultTimeout()
data := inspect.InspectImageJSON()
Expect(data[0].Os).To(Equal(runtime.GOOS))
Expect(data[0].Architecture).To(Equal(runtime.GOARCH))
session = podmanTest.PodmanNoCache([]string{"rmi", "alpine"}) session = podmanTest.PodmanNoCache([]string{"rmi", "alpine"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0)) Expect(session.ExitCode()).To(Equal(0))