Merge pull request #125 from linosgian/fix-untar-dest-paths

Pass relative paths to Docker build context

Author: agis

cmd/mistryd/end_to_end_test.go

@@ -367,6 +367,19 @@ func TestExitCode(t *testing.T) {
 	assert(br.ExitCode, 77, t)
 }
 
+func TestCopyDir(t *testing.T) {
+	cmdout, cmderr, err := cliBuildJob("--json-result", "--project", "copy-folder")
+	if err != nil {
+		t.Fatalf("mistry-cli stdout: %s, stderr: %s, err: %#v", cmdout, cmderr, err)
+	}
+	br, err := parseClientJSON(cmdout)
+	if err != nil {
+		panic(err)
+	}
+
+	assert(br.ExitCode, 0, t)
+}
+
 func TestSameGroupDifferentParams(t *testing.T) {
 	cmdout1, cmderr1, err := cliBuildJob("--project", "result-cache", "--group", "foo", "--", "--foo=bar")
 	if err != nil {

cmd/mistryd/testdata/projects/copy-folder/Dockerfile

@@ -0,0 +1,9 @@
+FROM debian:stretch
+
+COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
+RUN chmod +x /usr/local/bin/docker-entrypoint.sh
+
+COPY koko/ /koko/
+WORKDIR /data
+
+ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]

cmd/mistryd/testdata/projects/copy-folder/docker-entrypoint.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+#HACK: mistry will attempt to copy all artifacts out of the container
+# Therefore we need to leave something behind. This might or might not be
+# the intented behaviour. Revisit in the future.
+touch /data/artifacts/foo
+stat /koko/lala.txt

cmd/mistryd/testdata/projects/copy-folder/koko/lala.txt

@@ -74,6 +74,12 @@ func Tar(root string) ([]byte, error) {
 			return err
 		}
 
+		// Preserve directory structure when docker "untars" the build context
+		hdr.Name, err = filepath.Rel(root, path)
+		if err != nil {
+			return err
+		}
+
 		err = tw.WriteHeader(hdr)
 		if err != nil {
 			return err