Skip to content

Commit 1b02182

Browse files
committed
[supervisor] use hard code HOME dir
1 parent bf9157a commit 1b02182

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

components/supervisor/pkg/supervisor/services.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -675,10 +675,7 @@ func (is *InfoService) WorkspaceInfo(context.Context, *api.WorkspaceInfoRequest)
675675
}
676676
}
677677

678-
resp.UserHome, err = os.UserHomeDir()
679-
if err != nil {
680-
return nil, status.Error(codes.Internal, err.Error())
681-
}
678+
resp.UserHome = "/home/gitpod"
682679

683680
endpoint, host, err := is.cfg.GitpodAPIEndpoint()
684681
if err != nil {
@@ -715,7 +712,7 @@ func (c *ControlService) ExposePort(ctx context.Context, req *api.ExposePortRequ
715712

716713
// CreateSSHKeyPair create a ssh key pair for the workspace.
717714
func (ss *ControlService) CreateSSHKeyPair(context.Context, *api.CreateSSHKeyPairRequest) (response *api.CreateSSHKeyPairResponse, err error) {
718-
home, _ := os.UserHomeDir()
715+
home := "/home/gitpod/"
719716
if ss.privateKey != "" && ss.publicKey != "" {
720717
checkKey := func() error {
721718
data, err := os.ReadFile(filepath.Join(home, ".ssh/authorized_keys"))

components/supervisor/pkg/supervisor/ssh.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -190,13 +190,10 @@ func prepareSSHKey(ctx context.Context, sshkey string) error {
190190
}
191191

192192
func writeSSHEnv(cfg *Config, envvars []string) error {
193-
home, err := os.UserHomeDir()
194-
if err != nil {
195-
return err
196-
}
193+
home := "/home/gitpod"
197194

198195
d := filepath.Join(home, ".ssh")
199-
err = os.MkdirAll(d, 0o700)
196+
err := os.MkdirAll(d, 0o700)
200197
if err != nil {
201198
return xerrors.Errorf("cannot create $HOME/.ssh: %w", err)
202199
}

0 commit comments

Comments
 (0)