From ff7abba47bb721e36027dbe4b092089c7f0d4798 Mon Sep 17 00:00:00 2001 From: Victor Noel Date: Fri, 4 Oct 2019 10:31:40 +0200 Subject: [PATCH] Fix integration tests for #776 --- ...dockerignore_relative => Dockerfile_dockerignore_relative} | 4 +++- ...erignore => Dockerfile_dockerignore_relative.dockerignore} | 0 pkg/util/fs_util_test.go | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) rename integration/dockerfiles/{Dockerfile_test_dockerignore_relative => Dockerfile_dockerignore_relative} (56%) rename integration/dockerfiles/{Dockerfile_test_dockerignore_relative.dockerignore => Dockerfile_dockerignore_relative.dockerignore} (100%) diff --git a/integration/dockerfiles/Dockerfile_test_dockerignore_relative b/integration/dockerfiles/Dockerfile_dockerignore_relative similarity index 56% rename from integration/dockerfiles/Dockerfile_test_dockerignore_relative rename to integration/dockerfiles/Dockerfile_dockerignore_relative index bc9426805..6ef2bac59 100644 --- a/integration/dockerfiles/Dockerfile_test_dockerignore_relative +++ b/integration/dockerfiles/Dockerfile_dockerignore_relative @@ -1,5 +1,7 @@ +# This is not included in integration tests because docker build does not exploit Dockerfile.dockerignore +# See https://github.com/moby/moby/issues/12886#issuecomment-523706042 for more details # This dockerfile makes sure Dockerfile.dockerignore is working # If so then ignore_relative/foo should copy to /foo # If not, then this image won't build because it will attempt to copy three files to /foo, which is a file not a directory -FROM scratch +FROM scratch COPY ignore_relative/* /foo diff --git a/integration/dockerfiles/Dockerfile_test_dockerignore_relative.dockerignore b/integration/dockerfiles/Dockerfile_dockerignore_relative.dockerignore similarity index 100% rename from integration/dockerfiles/Dockerfile_test_dockerignore_relative.dockerignore rename to integration/dockerfiles/Dockerfile_dockerignore_relative.dockerignore diff --git a/pkg/util/fs_util_test.go b/pkg/util/fs_util_test.go index 449df7464..886efcf8f 100644 --- a/pkg/util/fs_util_test.go +++ b/pkg/util/fs_util_test.go @@ -709,7 +709,7 @@ func Test_correctDockerignoreFileIsUsed(t *testing.T) { { name: "relative dockerfile used", args: args{ - dockerfilepath: "../../integration/dockerfiles/Dockerfile_test_dockerignore_relative", + dockerfilepath: "../../integration/dockerfiles/Dockerfile_dockerignore_relative", buildcontext: "../../integration/", excluded: []string{"ignore_relative/bar"}, included: []string{"ignore_relative/foo", "ignore/bar"},