Merge pull request #11 from reconquest/fix-sidecar-volume

sidecar/docker: fix container volume source for git
reconquest · Oct 21, 2020 · ad88297 · ad88297
2 parents 3c77762 + 0795436
commit ad88297
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/internal/sidecar/cloud_sidecar.go b/internal/sidecar/cloud_sidecar.go
@@ -55,7 +55,7 @@ type CloudSidecar struct {
 
 func (sidecar *CloudSidecar) ContainerVolumes() []executor.Volume {
 	return []executor.Volume{
-		executor.Volume(sidecar.hostSubDir + "/" + consts.SUBDIR_GIT + ":" + sidecar.gitDir),
+		executor.Volume(sidecar.hostSubDir + "/" + consts.SUBDIR_GIT + "/" + sidecar.slug + ":" + sidecar.gitDir),
 		executor.Volume(sidecar.hostSubDir + "/" + consts.SUBDIR_SSH + ":" + sidecar.sshDir),
 	}
 }
@@ -206,8 +206,8 @@ func (sidecar *CloudSidecar) Serve(
 
 	// cloning git repository and switching commit
 	commands := [][]string{
-		{`git`, `clone`, "--recursive", opts.CloneURL, sidecar.gitDir},
-		{`git`, `-C`, sidecar.gitDir, `checkout`, opts.Commit},
+		{"git", "-C", sidecar.gitDir, "clone", "--recursive", opts.CloneURL, "."},
+		{"git", "-C", sidecar.gitDir, "checkout", opts.Commit},
 	}
 
 	for _, cmd := range commands {