Don't assume /home/gitpod

Author: csweichel

components/content-service/pkg/git/git.go

@@ -183,8 +183,6 @@ func (c *Client) GitWithOutput(ctx context.Context, ignoreErr *string, subcomman
 		env = append(env, fmt.Sprintf("GIT_AUTH_PASSWORD=%s", pwd))
 	}
 
-	env = append(env, "HOME=/home/gitpod")
-
 	fullArgs = append(fullArgs, subcommand)
 	fullArgs = append(fullArgs, args...)
 

components/supervisor/cmd/dump-initializer.go

@@ -0,0 +1,38 @@
+// Copyright (c) 2021 Gitpod GmbH. All rights reserved.
+// Licensed under the GNU Affero General Public License (AGPL).
+// See License.AGPL.txt in the project root for license information.
+
+package cmd
+
+import (
+	"fmt"
+
+	csapi "github.com/gitpod-io/gitpod/content-service/api"
+	"github.com/gitpod-io/gitpod/content-service/pkg/executor"
+	"github.com/spf13/cobra"
+)
+
+var dumpInitializer = &cobra.Command{
+	Use:    "dump-init",
+	Hidden: true, // this is not official user-facing functionality, but just for debugging
+	Run: func(cmd *cobra.Command, args []string) {
+		fc, _ := executor.Prepare(&csapi.WorkspaceInitializer{
+			Spec: &csapi.WorkspaceInitializer_Git{
+				Git: &csapi.GitInitializer{
+					RemoteUri:        "https://github.com/gitpod-io/gitpod",
+					CheckoutLocation: "gitpod",
+					TargetMode:       csapi.CloneTargetMode_REMOTE_BRANCH,
+					CloneTaget:       "main",
+					Config: &csapi.GitConfig{
+						Authentication: csapi.GitAuthMethod_NO_AUTH,
+					},
+				},
+			},
+		}, nil)
+		fmt.Println(string(fc))
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(dumpInitializer)
+}

components/supervisor/pkg/supervisor/services.go

@@ -707,7 +707,7 @@ func (is *InfoService) WorkspaceInfo(context.Context, *api.WorkspaceInfoRequest)
 		}
 	}
 
-	resp.UserHome = "/home/gitpod"
+	resp.UserHome = os.Getenv("HOME")
 
 	endpoint, host, err := is.cfg.GitpodAPIEndpoint()
 	if err != nil {
@@ -752,7 +752,7 @@ func (c *ControlService) ExposePort(ctx context.Context, req *api.ExposePortRequ
 
 // CreateSSHKeyPair create a ssh key pair for the workspace.
 func (c *ControlService) CreateSSHKeyPair(ctx context.Context, req *api.CreateSSHKeyPairRequest) (response *api.CreateSSHKeyPairResponse, err error) {
-	home := "/home/gitpod/"
+	home := os.Getenv("HOME")
 	if c.privateKey != "" && c.publicKey != "" {
 		checkKey := func() error {
 			data, err := os.ReadFile(filepath.Join(home, ".ssh/authorized_keys"))

components/supervisor/pkg/supervisor/supervisor.go

@@ -531,23 +531,25 @@ func installDotfiles(ctx context.Context, cfg *Config, tokenService *InMemoryTok
 		return
 	}
 
-	const dotfilePath = "/home/gitpod/.dotfiles"
+	home := os.Getenv("HOME")
+
+	dotfilePath := filepath.Join(home, ".dotfiles")
 	if _, err := os.Stat(dotfilePath); err == nil {
 		// dotfile path exists already - nothing to do here
 		return
 	}
 
 	prep := func(cfg *Config, out io.Writer, name string, args ...string) *exec.Cmd {
 		cmd := exec.Command(name, args...)
-		cmd.Dir = "/home/gitpod"
+		cmd.Dir = home
 		runAsUser(cmd, cfg.WorkspaceLinuxUID, cfg.WorkspaceLinuxGID)
 		cmd.Stdout = out
 		cmd.Stderr = out
 		return cmd
 	}
 
 	err := func() (err error) {
-		out, err := os.OpenFile("/home/gitpod/.dotfiles.log", os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0644)
+		out, err := os.OpenFile(dotfilePath+".log", os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0644)
 		if err != nil {
 			return err
 		}
@@ -661,7 +663,7 @@ func installDotfiles(ctx context.Context, cfg *Config, tokenService *InMemoryTok
 				return nil
 			}
 
-			homeFN := filepath.Join("/home/gitpod", strings.TrimPrefix(path, dotfilePath))
+			homeFN := filepath.Join(os.Getenv("HOME"), strings.TrimPrefix(path, dotfilePath))
 			if _, err := os.Stat(homeFN); err == nil {
 				// homeFN exists already - do nothing
 				return nil
@@ -1028,8 +1030,10 @@ func buildChildProcEnv(cfg *Config, envvars []string, runGP bool) []string {
 	//     - https://github.com/mirror/busybox/blob/24198f652f10dca5603df7c704263358ca21f5ce/libbb/setup_environment.c#L32
 	//     - https://github.com/mirror/busybox/blob/24198f652f10dca5603df7c704263358ca21f5ce/libbb/login.c#L140-L170
 	//
-	envs["HOME"] = "/home/gitpod"
-	envs["USER"] = "gitpod"
+	if cfg.WorkspaceRuntime != WorkspaceRuntimeNextgen {
+		envs["HOME"] = "/home/gitpod"
+		envs["USER"] = "gitpod"
+	}
 
 	// Particular Java optimisation: Java pre v10 did not gauge it's available memory correctly, and needed explicitly setting "-Xmx" for all Hotspot/openJDK VMs
 	if mem, ok := envs["GITPOD_MEMORY"]; ok {