use Dockerfile-specific ignore-file when present

wunderio · Dec 3, 2024 · 4c6416c · 4c6416c
1 parent 7e6532c
commit 4c6416c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/cmd/ciImageBuild.go b/cmd/ciImageBuild.go
@@ -56,6 +56,10 @@ var ciImageBuildCmd = &cobra.Command{
 		if _, err := os.Stat(fmt.Sprintf("%s/.dockerignore", buildPath)); err == nil {
 			excludeDockerignore = fmt.Sprintf("--exclude-from='%s'/.dockerignore", buildPath)
 		}
+		// use <dockerfile>.dockerignore if exists, later takes precedence
+		if _, err := os.Stat(fmt.Sprintf("%s.dockerignore", dockerfile)); err == nil {
+			excludeDockerignore = fmt.Sprintf("--exclude-from='%s.dockerignore'", dockerfile)
+		}
 
 		// If no path is specified, build from an empty directory
 		if len(buildPath) == 0 {

diff --git a/cmd/ciImageUrl.go b/cmd/ciImageUrl.go
@@ -49,6 +49,10 @@ var ciImageUrlCmd = &cobra.Command{
 		if _, err := os.Stat(fmt.Sprintf("%s/.dockerignore", buildPath)); err == nil {
 			excludeDockerignore = fmt.Sprintf("--exclude-from='%s'/.dockerignore", buildPath)
 		}
+		// use <dockerfile>.dockerignore if exists, later takes precedence
+		if _, err := os.Stat(fmt.Sprintf("%s.dockerignore", dockerfile)); err == nil {
+			excludeDockerignore = fmt.Sprintf("--exclude-from='%s.dockerignore'", dockerfile)
+		}
 
 		// If no path is specified, build from an empty directory
 		if len(buildPath) == 0 {