From 0c0b063e73b9755a028295e86fa1453c9e317c1b Mon Sep 17 00:00:00 2001
From: Vaughn Dice <vadice@microsoft.com>
Date: Thu, 26 Mar 2020 14:40:49 -0600
Subject: [PATCH] fix(docker.go): read .dockerignore file for appropriate build
 exclusions

Signed-off-by: Vaughn Dice <vadice@microsoft.com>
---
 pkg/build/provider/docker.go |  8 +++++++-
 tests/build_test.go          | 30 ++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 tests/build_test.go

diff --git a/pkg/build/provider/docker.go b/pkg/build/provider/docker.go
index 8b71f9fbc..36439c669 100644
--- a/pkg/build/provider/docker.go
+++ b/pkg/build/provider/docker.go
@@ -10,6 +10,7 @@ import (
 	portercontext "get.porter.sh/porter/pkg/context"
 	"get.porter.sh/porter/pkg/manifest"
 	"github.com/docker/cli/cli/command"
+	clibuild "github.com/docker/cli/cli/command/image/build"
 	cliflags "github.com/docker/cli/cli/flags"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/pkg/archive"
@@ -43,7 +44,12 @@ func (b *DockerBuilder) BuildInvocationImage(manifest *manifest.Manifest) error
 			"BUNDLE_DIR": &build.BUNDLE_DIR,
 		},
 	}
-	tar, err := archive.TarWithOptions(path, &archive.TarOptions{})
+
+	excludes, err := clibuild.ReadDockerignore(path)
+	if err != nil {
+		return err
+	}
+	tar, err := archive.TarWithOptions(path, &archive.TarOptions{ExcludePatterns: excludes})
 	if err != nil {
 		return err
 	}
diff --git a/tests/build_test.go b/tests/build_test.go
new file mode 100644
index 000000000..b14a11c58
--- /dev/null
+++ b/tests/build_test.go
@@ -0,0 +1,30 @@
+// +build integration
+
+package tests
+
+import (
+	"path/filepath"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"get.porter.sh/porter/pkg/porter"
+)
+
+func TestBuild_withDockerignore(t *testing.T) {
+	p := porter.NewTestPorter(t)
+	p.SetupIntegrationTest()
+	defer p.CleanupIntegrationTest()
+	p.Debug = false
+
+	p.TestConfig.TestContext.AddTestDirectory(filepath.Join(p.TestDir, "testdata/bundles/outputs-example"), ".")
+
+	// Create .dockerignore file which ignores the Dockerfile
+	err := p.FileSystem.WriteFile(".dockerignore", []byte("Dockerfile"), 0644)
+	require.NoError(t, err)
+
+	// Verify Porter uses the .dockerignore file
+	opts := porter.BuildOptions{}
+	err = p.Build(opts)
+	require.EqualError(t, err, "unable to build CNAB invocation image: Error response from daemon: Cannot locate specified Dockerfile: Dockerfile")
+}