Merge pull request #1122 from dgageot/fix-1110

Support for dot files in dockerignore
GoogleContainerTools · Oct 9, 2018 · 0cfc833 · 0cfc833
2 parents 22667e2 + 7f47223
commit 0cfc833
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 4 deletions.
diff --git a/pkg/skaffold/docker/parse.go b/pkg/skaffold/docker/parse.go
@@ -304,6 +304,10 @@ func GetDependencies(workspace string, a *latest.DockerArtifact) ([]string, erro
 			if err := godirwalk.Walk(absDep, &godirwalk.Options{
 				Unsorted: true,
 				Callback: func(fpath string, info *godirwalk.Dirent) error {
+					if fpath == absDep {
+						return nil
+					}
+
 					relPath, err := filepath.Rel(workspace, fpath)
 					if err != nil {
 						return err

diff --git a/pkg/skaffold/docker/parse_test.go b/pkg/skaffold/docker/parse_test.go
@@ -168,6 +168,11 @@ FROM base as dist
 FROM DIST as prod
 `
 
+const copyAll = `
+FROM nginx
+COPY . /
+`
+
 type fakeImageFetcher struct {
 	fetched []string
 }
@@ -284,7 +289,7 @@ func TestGetDependencies(t *testing.T) {
 			dockerfile:  copyDirectory,
 			ignore:      "bar\ndocker/*",
 			workspace:   ".",
-			expected:    []string{"Dockerfile", "file", "server.go", "test.conf", "worker.go"},
+			expected:    []string{".dot", "Dockerfile", "file", "server.go", "test.conf", "worker.go"},
 			fetched:     []string{"nginx"},
 		},
 		{
@@ -303,19 +308,42 @@ func TestGetDependencies(t *testing.T) {
 			expected:    []string{"Dockerfile", "nginx.conf"},
 			fetched:     []string{"nginx"},
 		},
+		{
+			description: "ignore none",
+			dockerfile:  copyAll,
+			workspace:   ".",
+			expected:    []string{".dot", "Dockerfile", "bar", filepath.Join("docker", "bar"), filepath.Join("docker", "nginx.conf"), "file", "server.go", "test.conf", "worker.go"},
+			fetched:     []string{"nginx"},
+		},
+		{
+			description: "ignore dotfiles",
+			dockerfile:  copyAll,
+			workspace:   ".",
+			ignore:      ".*",
+			expected:    []string{"Dockerfile", "bar", filepath.Join("docker", "bar"), filepath.Join("docker", "nginx.conf"), "file", "server.go", "test.conf", "worker.go"},
+			fetched:     []string{"nginx"},
+		},
+		{
+			description: "ignore dotfiles (root syntax)",
+			dockerfile:  copyAll,
+			workspace:   ".",
+			ignore:      "/.*",
+			expected:    []string{"Dockerfile", "bar", filepath.Join("docker", "bar"), filepath.Join("docker", "nginx.conf"), "file", "server.go", "test.conf", "worker.go"},
+			fetched:     []string{"nginx"},
+		},
 		{
 			description: "dockerignore with context in parent directory",
 			dockerfile:  copyDirectory,
 			workspace:   "docker/..",
 			ignore:      "bar\ndocker/*\n*.go",
-			expected:    []string{"Dockerfile", "file", "test.conf"},
+			expected:    []string{".dot", "Dockerfile", "file", "test.conf"},
 			fetched:     []string{"nginx"},
 		},
 		{
 			description: "onbuild test",
 			dockerfile:  onbuild,
 			workspace:   ".",
-			expected:    []string{"Dockerfile", "bar", filepath.Join("docker", "bar"), filepath.Join("docker", "nginx.conf"), "file", "server.go", "test.conf", "worker.go"},
+			expected:    []string{".dot", "Dockerfile", "bar", filepath.Join("docker", "bar"), filepath.Join("docker", "nginx.conf"), "file", "server.go", "test.conf", "worker.go"},
 			fetched:     []string{"golang:onbuild"},
 		},
 		{
@@ -419,7 +447,7 @@ func TestGetDependencies(t *testing.T) {
 			RetrieveImage = imageFetcher.fetch
 			defer func() { RetrieveImage = retrieveImage }()
 
-			for _, file := range []string{"docker/nginx.conf", "docker/bar", "server.go", "test.conf", "worker.go", "bar", "file"} {
+			for _, file := range []string{"docker/nginx.conf", "docker/bar", "server.go", "test.conf", "worker.go", "bar", "file", ".dot"} {
 				tmpDir.Write(file, "")
 			}