From 4077614fb3e2324ddb897adf3cd092a8085543c1 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 17 Feb 2017 10:34:33 -0800 Subject: [PATCH] fix DockerSchema1RegistrySuite.TestPullFailsWithAlteredLayer This test was failing if after the busybox image switched to a single layer. The test fails because it alters the data of an empty layer and relies on a side effect of another empty layer not being skipped on pull to pass. (The original patch was provided by Tonis Tiigi) Signed-off-by: Sebastiaan van Stijn --- integration-cli/docker_cli_by_digest_test.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/integration-cli/docker_cli_by_digest_test.go b/integration-cli/docker_cli_by_digest_test.go index ec3983052a..b192b2d350 100644 --- a/integration-cli/docker_cli_by_digest_test.go +++ b/integration-cli/docker_cli_by_digest_test.go @@ -31,7 +31,10 @@ func setupImage(c *check.C) (digest.Digest, error) { func setupImageWithTag(c *check.C, tag string) (digest.Digest, error) { containerName := "busyboxbydigest" - dockerCmd(c, "run", "-e", "digest=1", "--name", containerName, "busybox") + // new file is committed because this layer is used for detecting malicious + // changes. if this was committed as empty layer it would be skipped on pull + // and malicious changes would never be detected. + dockerCmd(c, "run", "-e", "digest=1", "--name", containerName, "busybox", "touch", "anewfile") // tag the image to upload it to the private registry repoAndTag := repoName + ":" + tag