diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-09-09 14:12:00 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-09 14:12:00 -0400 |
| commit | 08b602043ec07601b9be23c449c7773067683d90 (patch) | |
| tree | b26552e255e42536992119c75f31eb2dc20074cb | |
| parent | 68dace0619b86196c38945d0918181272656a254 (diff) | |
| parent | 1d7d21819138b2b1c7abd732dbf26bca5fc8e951 (diff) | |
| download | podman-08b602043ec07601b9be23c449c7773067683d90.tar.gz podman-08b602043ec07601b9be23c449c7773067683d90.tar.bz2 podman-08b602043ec07601b9be23c449c7773067683d90.zip | |
Merge pull request #7575 from rhatdan/runlabel
Fix podman container runlabel --display
| -rw-r--r-- | pkg/domain/infra/abi/containers_runlabel.go | 5 | ||||
| -rw-r--r-- | test/e2e/runlabel_test.go | 15 |
2 files changed, 20 insertions, 0 deletions
diff --git a/pkg/domain/infra/abi/containers_runlabel.go b/pkg/domain/infra/abi/containers_runlabel.go index ab2316d47..3983ba3a8 100644 --- a/pkg/domain/infra/abi/containers_runlabel.go +++ b/pkg/domain/infra/abi/containers_runlabel.go @@ -36,6 +36,11 @@ func (ic *ContainerEngine) ContainerRunlabel(ctx context.Context, label string, return err } + if options.Display { + fmt.Printf("command: %s\n", strings.Join(append([]string{os.Args[0]}, cmd[1:]...), " ")) + return nil + } + stdErr := os.Stderr stdOut := os.Stdout stdIn := os.Stdin diff --git a/test/e2e/runlabel_test.go b/test/e2e/runlabel_test.go index de79b2b98..f17b4d560 100644 --- a/test/e2e/runlabel_test.go +++ b/test/e2e/runlabel_test.go @@ -72,6 +72,21 @@ var _ = Describe("podman container runlabel", func() { result.WaitWithDefaultTimeout() Expect(result.ExitCode()).To(Equal(0)) }) + + It("podman container runlabel --display", func() { + SkipIfRemote() + image := "podman-runlabel-test:ls" + podmanTest.BuildImage(LsDockerfile, image, "false") + + result := podmanTest.Podman([]string{"container", "runlabel", "--display", "RUN", image}) + result.WaitWithDefaultTimeout() + Expect(result.ExitCode()).To(Equal(0)) + Expect(result.OutputToString()).To(ContainSubstring(podmanTest.PodmanBinary + " -la")) + + result = podmanTest.Podman([]string{"rmi", image}) + result.WaitWithDefaultTimeout() + Expect(result.ExitCode()).To(Equal(0)) + }) It("podman container runlabel bogus label should result in non-zero exit code", func() { result := podmanTest.Podman([]string{"container", "runlabel", "RUN", ALPINE}) result.WaitWithDefaultTimeout() |