mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Merge pull request #10190 from ashahab-altiscale/9875-lxc-run-links
LXC needs stdin for container to remain up
This commit is contained in:
commit
7b48488c56
1 changed files with 2 additions and 2 deletions
|
@ -316,7 +316,7 @@ func TestRunWithoutNetworking(t *testing.T) {
|
||||||
|
|
||||||
//test --link use container name to link target
|
//test --link use container name to link target
|
||||||
func TestRunLinksContainerWithContainerName(t *testing.T) {
|
func TestRunLinksContainerWithContainerName(t *testing.T) {
|
||||||
cmd := exec.Command(dockerBinary, "run", "-t", "-d", "--name", "parent", "busybox")
|
cmd := exec.Command(dockerBinary, "run", "-i", "-t", "-d", "--name", "parent", "busybox")
|
||||||
out, _, _, err := runCommandWithStdoutStderr(cmd)
|
out, _, _, err := runCommandWithStdoutStderr(cmd)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("failed to run container: %v, output: %q", err, out)
|
t.Fatalf("failed to run container: %v, output: %q", err, out)
|
||||||
|
@ -342,7 +342,7 @@ func TestRunLinksContainerWithContainerName(t *testing.T) {
|
||||||
|
|
||||||
//test --link use container id to link target
|
//test --link use container id to link target
|
||||||
func TestRunLinksContainerWithContainerId(t *testing.T) {
|
func TestRunLinksContainerWithContainerId(t *testing.T) {
|
||||||
cmd := exec.Command(dockerBinary, "run", "-t", "-d", "busybox")
|
cmd := exec.Command(dockerBinary, "run", "-i", "-t", "-d", "busybox")
|
||||||
cID, _, _, err := runCommandWithStdoutStderr(cmd)
|
cID, _, _, err := runCommandWithStdoutStderr(cmd)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("failed to run container: %v, output: %q", err, cID)
|
t.Fatalf("failed to run container: %v, output: %q", err, cID)
|
||||||
|
|
Loading…
Reference in a new issue