diff options
| author | Boaz Shuster <boaz.shuster.github@gmail.com> | 2022-09-16 10:52:58 +0300 |
|---|---|---|
| committer | Boaz Shuster <boaz.shuster.github@gmail.com> | 2022-09-20 22:42:49 +0300 |
| commit | 377773ab5b855fdaa32fba0896768aa97674c7e6 (patch) | |
| tree | b7050ac7788684cfb3d411fa1f2edfbedfd84276 | |
| parent | 750726e62c13941a739ef70040a1ec0d745cdb43 (diff) | |
| download | podman-377773ab5b855fdaa32fba0896768aa97674c7e6.tar.gz podman-377773ab5b855fdaa32fba0896768aa97674c7e6.tar.bz2 podman-377773ab5b855fdaa32fba0896768aa97674c7e6.zip | |
Fix podman-remote run --attach stdin to show container ID
Signed-off-by: Boaz Shuster <boaz.shuster.github@gmail.com>
| -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 572807ad6..4f955e45c 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 |