diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-09-21 13:12:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-21 13:12:44 +0200 |
| commit | fea325327106aebc08fd6b11bc77c434e614c3e9 (patch) | |
| tree | 22224da22da2b020f95ae793768dd4722d994168 | |
| parent | 30231d0da7e6dcf3d6d1f45b10150baae35aaf28 (diff) | |
| parent | 377773ab5b855fdaa32fba0896768aa97674c7e6 (diff) | |
| download | podman-fea325327106aebc08fd6b11bc77c434e614c3e9.tar.gz podman-fea325327106aebc08fd6b11bc77c434e614c3e9.tar.bz2 podman-fea325327106aebc08fd6b11bc77c434e614c3e9.zip | |
Merge pull request #15866 from boaz0/closes_15746
Fix podman-remote run --attach stdin to show container ID
| -rw-r--r-- | pkg/domain/infra/tunnel/containers.go | 3 | ||||
| -rw-r--r-- | test/system/030-run.bats | 10 |
2 files changed, 13 insertions, 0 deletions
diff --git a/pkg/domain/infra/tunnel/containers.go b/pkg/domain/infra/tunnel/containers.go index 0dc73081d..c82c9ba33 100644 --- a/pkg/domain/infra/tunnel/containers.go +++ b/pkg/domain/infra/tunnel/containers.go @@ -620,6 +620,9 @@ func (ic *ContainerEngine) ContainerExecDetached(ctx context.Context, nameOrID s } func startAndAttach(ic *ContainerEngine, name string, detachKeys *string, input, output, errput *os.File) error { + if output == nil && errput == nil { + fmt.Printf("%s\n", name) + } attachErr := make(chan error) attachReady := make(chan bool) options := new(containers.AttachOptions).WithStream(true) diff --git a/test/system/030-run.bats b/test/system/030-run.bats index b1ce91d14..8cd29e744 100644 --- a/test/system/030-run.bats +++ b/test/system/030-run.bats @@ -892,4 +892,14 @@ $IMAGE--c_ok" \ run_podman container rm -f -t 0 c_ok c_fail_no_rm } +@test "podman run --attach stdin prints container ID" { + ctr_name="container-$(random_string 5)" + run_podman run --name $ctr_name --attach stdin $IMAGE echo hello + run_output=$output + run_podman inspect --format "{{.Id}}" $ctr_name + ctr_id=$output + is "$run_output" "$ctr_id" "Did not find container ID in the output" + run_podman rm $ctr_name +} + # vim: filetype=sh |