Revendor hcsshim

Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: d96e36cbbfb076f4adb967644e7d6e2da73eb0ec
Component: engine

components/engine/integration-cli/docker_cli_build_test.go

@@ -6740,3 +6740,18 @@ func (s *DockerSuite) TestBuildLabelsOverride(c *check.C) {
 	}
 
 }
+
+// Test case for #22855
+func (s *DockerSuite) TestBuildDeleteCommittedFile(c *check.C) {
+	name := "test-delete-committed-file"
+
+	_, err := buildImage(name,
+		`FROM busybox
+		RUN echo test > file
+		RUN test -e file
+		RUN rm file
+		RUN sh -c "! test -e file"`, false)
+	if err != nil {
+		c.Fatal(err)
+	}
+}