Merge pull request #340 from sayan-biswas/fix-local-source-build

Fix local source build

Author: openshift-merge-bot[bot]

pkg/shp/cmd/build/upload.go

@@ -131,11 +131,12 @@ func (u *UploadCommand) Complete(p *params.Params, _ *genericclioptions.IOStream
 	if build.Spec.Source != nil {
 		if build.Spec.Source.OCIArtifact != nil && build.Spec.Source.OCIArtifact.Image != "" {
 			u.sourceBundleImage = build.Spec.Source.OCIArtifact.Image
-
-		} else {
-			u.dataStreamer = streamer.NewStreamer(restConfig, clientset)
 		}
 	}
+
+	// Create a streamer instance to stream data onto pod for local source build.
+	u.dataStreamer = streamer.NewStreamer(restConfig, clientset)
+
 	u.pw, err = p.NewPodWatcher(u.Cmd().Context())
 	return err
 }

pkg/shp/streamer/streamer.go

@@ -27,7 +27,7 @@ type Streamer struct {
 type WriterFn func(w io.Writer) error
 
 // tarCmd base tar command to be executed on the POD, a target directory should be appended.
-var tarCmd = []string{"tar", "xfv", "-", "-C"}
+var tarCmd = []string{"tar", "--no-same-permissions", "--no-same-owner", "-xvf", "-", "-C"}
 
 // doneCmd command to notify the container the data streaming is done, thus the container build
 // process can continue.

pkg/shp/streamer/streamer_test.go

@@ -47,7 +47,7 @@ func Test_Streamer(t *testing.T) {
 		return err
 	}, size)
 	g.Expect(err).To(o.BeNil())
-	g.Expect(re.Command()).To(o.Equal([]string{"tar", "xfv", "-", "-C", "/"}))
+	g.Expect(re.Command()).To(o.Equal([]string{"tar", "--no-same-permissions", "--no-same-owner", "-xvf", "-", "-C", "/"}))
 	g.Expect(re.Stdin()).To(o.Equal(stdin))
 
 	// calling out "done" command on target pod, and making sure the command informed is expected