Fix Dockerfile not located when added to dockerignore (#2272)

* test(testdata): add a dockerignore file to the testdata directory to replicate the bug 2203
* fix(container): include the target dockerignore and the target dockerfile to the buildcontext 2203
* test(container): update the parse docker ignore test case to pass under the new changes 2203

container.go

@@ -194,6 +194,8 @@ func (c *ContainerRequest) Validate() error {
 
 // GetContext retrieve the build context for the request
 func (c *ContainerRequest) GetContext() (io.Reader, error) {
+	var includes []string = []string{"."}
+
 	if c.ContextArchive != nil {
 		return c.ContextArchive, nil
 	}
@@ -209,7 +211,14 @@ func (c *ContainerRequest) GetContext() (io.Reader, error) {
 	if err != nil {
 		return nil, err
 	}
-	buildContext, err := archive.TarWithOptions(c.Context, &archive.TarOptions{ExcludePatterns: excluded})
+
+	dockerIgnoreLocation := filepath.Join(abs, ".dockerignore")
+	includes = append(includes, dockerIgnoreLocation, c.GetDockerfile())
+
+	buildContext, err := archive.TarWithOptions(
+		c.Context,
+		&archive.TarOptions{ExcludePatterns: excluded, IncludeFiles: includes},
+	)
 	if err != nil {
 		return nil, err
 	}

container_test.go

@@ -502,7 +502,7 @@ func TestParseDockerIgnore(t *testing.T) {
 		{
 			filePath:         "./testdata",
 			expectedErr:      nil,
-			expectedExcluded: []string(nil),
+			expectedExcluded: []string{"Dockerfile", "echo.Dockerfile"},
 		},
 	}
 

testdata/.dockerignore

@@ -0,0 +1,2 @@
+Dockerfile
+echo.Dockerfile