From ac1fc880813e2c73280f9c0aaa384630be32eedd Mon Sep 17 00:00:00 2001
From: Chris Hoffman <cehoffman@users.noreply.github.com>
Date: Wed, 14 Apr 2021 11:02:24 -0500
Subject: [PATCH] Copy dockerfile.dockerignore if it exists when copying
 Dockerfile (#1607)

---
 cmd/executor/cmd/root.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/cmd/executor/cmd/root.go b/cmd/executor/cmd/root.go
index 1d43d952a..da3a85bc2 100644
--- a/cmd/executor/cmd/root.go
+++ b/cmd/executor/cmd/root.go
@@ -261,6 +261,12 @@ func copyDockerfile() error {
 	if _, err := util.CopyFile(opts.DockerfilePath, constants.DockerfilePath, util.FileContext{}, util.DoNotChangeUID, util.DoNotChangeGID); err != nil {
 		return errors.Wrap(err, "copying dockerfile")
 	}
+	dockerignorePath := opts.DockerfilePath + ".dockerignore"
+	if util.FilepathExists(dockerignorePath) {
+		if _, err := util.CopyFile(dockerignorePath, constants.DockerfilePath+".dockerignore", util.FileContext{}, util.DoNotChangeUID, util.DoNotChangeGID); err != nil {
+			return errors.Wrap(err, "copying Dockerfile.dockerignore")
+		}
+	}
 	opts.DockerfilePath = constants.DockerfilePath
 	return nil
 }