fix: compare relative paths when excluding, fixes kreuzwerker#280

marcelmeulemans · Nov 26, 2021 · 8b85dff · 8b85dff
1 parent f8422a5
commit 8b85dff
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/internal/provider/resource_docker_registry_image_funcs.go b/internal/provider/resource_docker_registry_image_funcs.go
@@ -292,7 +292,7 @@ func buildDockerImageContextTar(buildContext string) (string, error) {
 
 	pm, err := fileutils.NewPatternMatcher(excludes)
 	if err != nil {
-		return "", fmt.Errorf("unable to create pattern matcher from .dockerignore exlcudes - %v", err.Error())
+		return "", fmt.Errorf("unable to create pattern matcher from .dockerignore excludes - %v", err.Error())
 	}
 
 	tw := tar.NewWriter(tmpFile)
@@ -305,7 +305,8 @@ func buildDockerImageContextTar(buildContext string) (string, error) {
 		}
 
 		// if .dockerignore is present, ignore files from there
-		skip, err := pm.Matches(file)
+		rel, _ := filepath.Rel(buildContext, file)
+		skip, err := pm.Matches(rel)
 		if err != nil {
 			return err
 		}

diff --git a/scripts/testing/docker_registry_image_context_dockerignore/Dockerfile b/scripts/testing/docker_registry_image_context_dockerignore/Dockerfile
@@ -1,2 +1,2 @@
 FROM scratch
-COPY empty /empty
+COPY empty* /