Don't exclude Dockerfile, Containerfiles from tar content

If the user specifies "*" in a .dockerignore or a .containerignore then podman-remote build should not exclude the Dockerfile or Containerfile or any content pointed to by `-f` in the context directory. We still need these files on the server side to complete the build. Fixes: #9867 Signed-off-by: Daniel J Walsh <[email protected]>
containers · Jul 10, 2021 · 48ff2ef · 48ff2ef
1 parent bef1f03
commit 48ff2ef
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 2 deletions.
diff --git a/pkg/bindings/images/build.go b/pkg/bindings/images/build.go
@@ -301,6 +301,8 @@ func Build(ctx context.Context, containerFiles []string, options entities.BuildO
 
 	tarContent := []string{options.ContextDirectory}
 	newContainerFiles := []string{}
+
+	dontexcludes := []string{"!Dockerfile", "!Containerfile"}
 	for _, c := range containerFiles {
 		if c == "/dev/stdin" {
 			content, err := ioutil.ReadAll(os.Stdin)
@@ -328,6 +330,7 @@ func Build(ctx context.Context, containerFiles []string, options entities.BuildO
 		// Do NOT add to tarfile
 		if strings.HasPrefix(containerfile, contextDir+string(filepath.Separator)) {
 			containerfile = strings.TrimPrefix(containerfile, contextDir+string(filepath.Separator))
+			dontexcludes = append(dontexcludes, "!"+containerfile)
 		} else {
 			// If Containerfile does not exists assume it is in context directory, do Not add to tarfile
 			if _, err := os.Lstat(containerfile); err != nil {
@@ -349,8 +352,7 @@ func Build(ctx context.Context, containerFiles []string, options entities.BuildO
 		}
 		params.Set("dockerfile", string(cFileJSON))
 	}
-
-	tarfile, err := nTar(excludes, tarContent...)
+	tarfile, err := nTar(append(excludes, dontexcludes...), tarContent...)
 	if err != nil {
 		logrus.Errorf("cannot tar container entries %v error: %v", tarContent, err)
 		return nil, err

diff --git a/test/system/070-build.bats b/test/system/070-build.bats
@@ -509,6 +509,40 @@ EOF
     done
 }
 
+# Regression test for #9867
+# Make sure that if you exclude everything in context dir, that
+# the Containerfile/Dockerfile in the context dir are used
+@test "podman build with ignore '*'" {
+    local tmpdir=$PODMAN_TMPDIR/build-test-$(random_string 10)
+    mkdir -p $tmpdir
+
+    cat >$tmpdir/Containerfile <<EOF
+FROM scratch
+EOF
+
+cat >$tmpdir/.dockerignore <<EOF
+*
+EOF
+
+    run_podman build -t build_test $tmpdir
+
+    # Rename Containerfile to Dockerfile
+    mv $tmpdir/Containerfile $tmpdir/Dockerfile
+
+    run_podman build -t build_test $tmpdir
+
+    # Rename Dockerfile to foofile
+    mv $tmpdir/Dockerfile $tmpdir/foofile
+
+    run_podman 125 build -t build_test $tmpdir
+    is "$output" ".*Dockerfile: no such file or directory"
+
+    run_podman build -t build_test -f $tmpdir/foofile $tmpdir
+
+    # Clean up
+    run_podman rmi -f build_test
+}
+
 @test "podman build - stdin test" {
     # Random workdir, and random string to verify build output
     workdir=/$(random_string 10)