feat: support passing custom build user (#79)

README.md

@@ -57,6 +57,7 @@ Flags:
       --sudo                   Use sudo command for container runtime.
       --vol string             Mount local volumes into build container. (<src>:<destination>) (default [])
 
+  -u, --user string            Change default build user. Default value is from container in use.
 Global Flags:
   -v, --verbose   verbose output.
 ```

cmd/build.go

@@ -77,6 +77,7 @@ func newBuildCmd() *cobra.Command {
 	var metaFilePath string
 	var socketPath string
 	var localVolumes []string
+	var buildUser string
 
 	buildCmd := &cobra.Command{
 		Use:   "build [job name]",
@@ -256,6 +257,7 @@ func newBuildCmd() *cobra.Command {
 				SocketPath:      socketPath,
 				FlagVerbose:     flagVerbose,
 				LocalVolumes:    localVolumes,
+				BuildUser:       buildUser,
 			}
 
 			launch := launchNew(option)
@@ -357,5 +359,12 @@ ex) git@github.com:<org>/<repo>.git[#<branch>]
 		[]string{},
 		"Volumes to mount into build container.")
 
+	buildCmd.Flags().StringVarP(
+		&buildUser,
+		"user",
+		"u",
+		"",
+		"Change default build user. Default value is from container in use.")
+
 	return buildCmd
 }

cmd/root_test.go

@@ -60,6 +60,7 @@ Flags:
                                ex) git@github.com:<org>/<repo>.git[#<branch>]
                                    https://github.com/<org>/<repo>.git[#<branch>]
       --sudo                   Use sudo command for container runtime.
+  -u, --user string            Change default build user. Default value is from container in use.
       --vol strings            Volumes to mount into build container.
 
 `, defaultSocketPath)

launch/docker.go

@@ -31,6 +31,7 @@ type docker struct {
 	interact          Interacter
 	socketPath        string
 	localVolumes      []string
+	buildUser         string
 }
 
 var _ runner = (*docker)(nil)
@@ -46,7 +47,7 @@ const (
 	orgRepo = "sd-local/local-build"
 )
 
-func newDocker(setupImage, setupImageVer string, useSudo bool, interactiveMode bool, socketPath string, flagVerbose bool, localVolumes []string) runner {
+func newDocker(setupImage, setupImageVer string, useSudo bool, interactiveMode bool, socketPath string, flagVerbose bool, localVolumes []string, buildUser string) runner {
 	return &docker{
 		volume:            "SD_LAUNCH_BIN",
 		habVolume:         "SD_LAUNCH_HAB",
@@ -60,6 +61,7 @@ func newDocker(setupImage, setupImageVer string, useSudo bool, interactiveMode b
 		interact:          &Interact{flagVerbose: flagVerbose},
 		socketPath:        socketPath,
 		localVolumes:      localVolumes,
+		buildUser:         buildUser,
 	}
 }
 
@@ -148,6 +150,10 @@ func (d *docker) runBuild(buildEntry buildEntry) error {
 		dockerCommandOptions = append([]string{"--privileged"}, dockerCommandOptions...)
 	}
 
+	if d.buildUser != "" {
+		dockerCommandOptions = append([]string{fmt.Sprintf("-u%s", d.buildUser)}, dockerCommandOptions...)
+	}
+
 	if d.interactiveMode {
 		// attach build container for sd-local interact mode
 		cid, err := d.execDockerCommand(append(dockerCommandArgs, dockerCommandOptions...)...)

launch/docker_test.go

@@ -66,9 +66,10 @@ func TestNewDocker(t *testing.T) {
 			interact:          &Interact{},
 			socketPath:        "/auth.sock",
 			localVolumes:      []string{"path:path"},
+			buildUser:         "jithin",
 		}
 
-		d := newDocker("launcher", "latest", false, false, "/auth.sock", false, []string{"path:path"})
+		d := newDocker("launcher", "latest", false, false, "/auth.sock", false, []string{"path:path"}, "jithin")
 
 		assert.Equal(t, expected, d)
 	})

launch/launch.go

@@ -81,6 +81,7 @@ type Option struct {
 	SocketPath      string
 	FlagVerbose     bool
 	LocalVolumes    []string
+	BuildUser       string
 }
 
 const (
@@ -170,7 +171,7 @@ func createBuildEntry(option Option) buildEntry {
 func New(option Option) Launcher {
 	l := new(launch)
 
-	l.runner = newDocker(option.Entry.Launcher.Image, option.Entry.Launcher.Version, option.UseSudo, option.InteractiveMode, option.SocketPath, option.FlagVerbose, option.LocalVolumes)
+	l.runner = newDocker(option.Entry.Launcher.Image, option.Entry.Launcher.Version, option.UseSudo, option.InteractiveMode, option.SocketPath, option.FlagVerbose, option.LocalVolumes, option.BuildUser)
 	l.buildEntry = createBuildEntry(option)
 
 	return l