Fix staging permissions issues + bump to 0.6.0

VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

local/runner.go

@@ -249,8 +249,8 @@ func (r *Runner) buildContainerConfig(config *AppConfig, forwardConfig *service.
 	}
 
 	scriptBuffer := &bytes.Buffer{}
-	err = template.Must(template.New("").Parse(runnerScript)).Execute(scriptBuffer, options)
-	if err != nil {
+
+	if err := template.Must(template.New("").Parse(runnerScript)).Execute(scriptBuffer, options); err != nil {
 		return nil, err
 	}
 

local/stager.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"io"
 	"path/filepath"
+	"strconv"
 	"strings"
 	"text/template"
 
@@ -18,6 +19,14 @@ import (
 	"github.com/sclevine/cflocal/utils"
 )
 
+const stagerScript = `
+	set -e
+
+	chown -R vcap:vcap /tmp/app
+
+	exec su vcap -p -c "PATH=$PATH exec /tmp/lifecycle/builder -buildpackOrder $0 -skipDetect=$1"
+`
+
 type Stager struct {
 	DiegoVersion string
 	GoVersion    string
@@ -104,14 +113,14 @@ func (s *Stager) Stage(config *StageConfig, color Colorizer) (droplet Stream, er
 		Name: name + "-stage",
 		Config: &container.Config{
 			Hostname:   "cflocal",
-			User:       "vcap",
+			User:       "root",
 			Env:        mapToEnv(mergeMaps(env, config.AppConfig.StagingEnv, config.AppConfig.Env)),
 			Image:      "cflocal",
 			WorkingDir: "/home/vcap",
 			Entrypoint: strslice.StrSlice{
-				"/tmp/lifecycle/builder",
-				"-buildpackOrder", strings.Join(config.Buildpacks, ","),
-				fmt.Sprintf("-skipDetect=%t", len(config.Buildpacks) == 1),
+				"/bin/bash", "-c", stagerScript,
+				strings.Join(config.Buildpacks, ","),
+				strconv.FormatBool(len(config.Buildpacks) == 1),
 			},
 		},
 		Docker: s.Docker,
@@ -160,7 +169,7 @@ func (s *Stager) Stage(config *StageConfig, color Colorizer) (droplet Stream, er
 		return Stream{}, err
 	}
 	droplet.ReadCloser = dropletTar // allows removal in error case
-	dropletReader, err := utils.FileFromTar("droplet", dropletTar)
+	dropletReader, _, err := utils.FileFromTar("droplet", dropletTar)
 	if err != nil {
 		return Stream{}, err
 	}
@@ -193,7 +202,7 @@ func (s *Stager) Download(path string) (stream Stream, err error) {
 		return Stream{}, err
 	}
 	stream.ReadCloser = tar // allows deferred removal in error case
-	reader, err := utils.FileFromTar(filename, tar)
+	reader, _, err := utils.FileFromTar(filename, tar)
 	if err != nil {
 		return Stream{}, err
 	}

local/stager_test.go

@@ -1,6 +1,7 @@
 package local_test
 
 import (
+	"archive/tar"
 	"bytes"
 	"compress/gzip"
 	"io"
@@ -72,16 +73,27 @@ var _ = Describe("Stager", func() {
 			Expect(logs).To(gbytes.Say(`\[some-app\] % \S+ Compile message from stdout\.`))
 
 			Expect(droplet.Size).To(BeNumerically(">", 500))
-			Expect(droplet.Size).To(BeNumerically("<", 1000))
+			Expect(droplet.Size).To(BeNumerically("<", 1500))
 
 			dropletTar, err := gzip.NewReader(droplet)
 			Expect(err).NotTo(HaveOccurred())
 			dropletBuffer, err := ioutil.ReadAll(dropletTar)
 			Expect(err).NotTo(HaveOccurred())
 
-			Expect(fileFromTar("./app/some-file", dropletBuffer)).To(Equal("some-contents"))
-			Expect(fileFromTar("./staging_info.yml", dropletBuffer)).To(ContainSubstring("start_command"))
-			Expect(fileFromTar("./app/env", dropletBuffer)).To(Equal(stagingEnvFixture))
+			file1, header1 := fileFromTar("./app/some-file", dropletBuffer)
+			Expect(file1).To(Equal("some-contents"))
+			Expect(header1.Uid).To(Equal(2000))
+			Expect(header1.Gid).To(Equal(2000))
+
+			file2, header2 := fileFromTar("./staging_info.yml", dropletBuffer)
+			Expect(file2).To(ContainSubstring("start_command"))
+			Expect(header2.Uid).To(Equal(2000))
+			Expect(header2.Gid).To(Equal(2000))
+
+			file3, header3 := fileFromTar("./app/env", dropletBuffer)
+			Expect(file3).To(Equal(stagingEnvFixture))
+			Expect(header3.Uid).To(Equal(2000))
+			Expect(header3.Gid).To(Equal(2000))
 
 			// TODO: test that no "some-app-staging-GUID" containers exist
 
@@ -120,10 +132,10 @@ var _ = Describe("Stager", func() {
 	})
 })
 
-func fileFromTar(path string, tarball []byte) string {
-	file, err := utils.FileFromTar(path, bytes.NewReader(tarball))
+func fileFromTar(path string, tarball []byte) (string, *tar.Header) {
+	file, header, err := utils.FileFromTar(path, bytes.NewReader(tarball))
 	ExpectWithOffset(1, err).NotTo(HaveOccurred())
 	contents, err := ioutil.ReadAll(file)
 	ExpectWithOffset(1, err).NotTo(HaveOccurred())
-	return string(contents)
+	return string(contents), header
 }

utils/fs.go

@@ -17,7 +17,6 @@ func (f *FS) Tar(path string) (io.ReadCloser, error) {
 	}
 	return archive.TarWithOptions(absPath, &archive.TarOptions{
 		ExcludePatterns: []string{filepath.Join(path, "*.droplet")},
-		ChownOpts:       &archive.TarChownOptions{UID: 2000, GID: 2000},
 	})
 }
 

utils/io.go

@@ -37,16 +37,16 @@ func TarFile(name string, contents io.Reader, size, mode int64) (io.Reader, erro
 	return tarBuffer, nil
 }
 
-func FileFromTar(name string, archive io.Reader) (io.Reader, error) {
+func FileFromTar(name string, archive io.Reader) (file io.Reader, header *tar.Header, err error) {
 	tarball := tar.NewReader(archive)
 	for {
-		header, err := tarball.Next()
+		header, err = tarball.Next()
 		if err != nil {
-			return nil, err
+			return nil, nil, err
 		}
 		if header.Name == name {
 			break
 		}
 	}
-	return tarball, nil
+	return tarball, header, nil
 }