From 82a799b98b13aff684560e002e130b645205fc55 Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Mon, 2 Jun 2014 19:54:17 +0000 Subject: [PATCH 1/2] pull only busybox:latest Docker-DCO-1.1-Signed-off-by: Victor Vieux (github: vieux) Upstream-commit: b8932abcd3f3932b6b56aa859b4c0762a95f7179 Component: engine --- components/engine/integration-cli/docker_cli_pull_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/integration-cli/docker_cli_pull_test.go b/components/engine/integration-cli/docker_cli_pull_test.go index 13b443f3d6..fa7d2be44e 100644 --- a/components/engine/integration-cli/docker_cli_pull_test.go +++ b/components/engine/integration-cli/docker_cli_pull_test.go @@ -8,7 +8,7 @@ import ( // pulling an image from the central registry should work func TestPullImageFromCentralRegistry(t *testing.T) { - pullCmd := exec.Command(dockerBinary, "pull", "busybox") + pullCmd := exec.Command(dockerBinary, "pull", "busybox:latest") out, exitCode, err := runCommandWithOutput(pullCmd) errorOut(err, t, fmt.Sprintf("%s %s", out, err)) From da1e276039f4793d01c84376b93ae8cda5504de5 Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Mon, 2 Jun 2014 19:54:33 +0000 Subject: [PATCH 2/2] fix busybox image detection Docker-DCO-1.1-Signed-off-by: Victor Vieux (github: vieux) Upstream-commit: 730d9ba17421e82012664c44aef7f64600b756cb Component: engine --- components/engine/integration/runtime_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/engine/integration/runtime_test.go b/components/engine/integration/runtime_test.go index 9c59d38e01..96df15be60 100644 --- a/components/engine/integration/runtime_test.go +++ b/components/engine/integration/runtime_test.go @@ -133,10 +133,10 @@ func init() { func setupBaseImage() { eng := newTestEngine(log.New(os.Stderr, "", 0), false, unitTestStoreBase) - job := eng.Job("inspect", unitTestImageName, "image") + job := eng.Job("image_inspect", unitTestImageName) img, _ := job.Stdout.AddEnv() // If the unit test is not found, try to download it. - if err := job.Run(); err != nil || img.Get("id") != unitTestImageID { + if err := job.Run(); err != nil || img.Get("Id") != unitTestImageID { // Retrieve the Image job = eng.Job("pull", unitTestImageName) job.Stdout.Add(utils.NopWriteCloser(os.Stdout))