diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-03-16 12:23:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-16 12:23:56 +0100 |
| commit | af1ac85da64dcf79c565f1277160d0047c6e0b2f (patch) | |
| tree | 9f4739e4ec74d4a82107ca0d43a870fc8547a14e | |
| parent | 8b07ad1138bea8dfa71890c22e811bdd809b4e7e (diff) | |
| parent | 9ca4b6c6f5105566b19c87f2ecd1bc1d54f791d3 (diff) | |
| download | podman-af1ac85da64dcf79c565f1277160d0047c6e0b2f.tar.gz podman-af1ac85da64dcf79c565f1277160d0047c6e0b2f.tar.bz2 podman-af1ac85da64dcf79c565f1277160d0047c6e0b2f.zip | |
Merge pull request #5508 from baude/buildaddarchos
add os|arch attributes when building
| -rw-r--r-- | cmd/podman/build.go | 2 | ||||
| -rw-r--r-- | test/e2e/build_test.go | 10 |
2 files changed, 12 insertions, 0 deletions
diff --git a/cmd/podman/build.go b/cmd/podman/build.go index b8b315c68..acd402fdd 100644 --- a/cmd/podman/build.go +++ b/cmd/podman/build.go @@ -342,6 +342,7 @@ func buildCmd(c *cliconfig.BuildValues) error { } options := imagebuildah.BuildOptions{ + Architecture: c.Arch, CommonBuildOpts: &buildOpts, AdditionalTags: tags, Annotations: c.Annotation, @@ -359,6 +360,7 @@ func buildCmd(c *cliconfig.BuildValues) error { Layers: layers, NamespaceOptions: nsValues, NoCache: c.NoCache, + OS: c.OS, Out: stdout, Output: output, OutputFormat: format, diff --git a/test/e2e/build_test.go b/test/e2e/build_test.go index b4e400549..240ef1627 100644 --- a/test/e2e/build_test.go +++ b/test/e2e/build_test.go @@ -6,6 +6,7 @@ import ( "io/ioutil" "os" "path/filepath" + "runtime" "strings" . "github.com/containers/libpod/test/utils" @@ -43,6 +44,15 @@ var _ = Describe("Podman build", func() { session.WaitWithDefaultTimeout() 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.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) |