Skip to content
This repository has been archived by the owner on Jan 17, 2021. It is now read-only.

fix #167 use latest version of code-server #182

Closed
wants to merge 3 commits into from

Conversation

gyzerok
Copy link

@gyzerok gyzerok commented May 13, 2020

Hello!

This PR fixes #167

There was a bit of a jungle with #178 and #181, so let me explain what happened.

Big thanks to @Merith-TK I realized, that the different PR order would make more sense. However we misunderstood each other a bit with the PR openings. Anyway - everything is clear now, so I am making the PRs in the right order. My apologies for the PR jungling :)

@@ -21,7 +22,7 @@ import (
"golang.org/x/xerrors"
)

const codeServerPath = "~/.cache/sshcode/sshcode-server"
const codeServerDir = "~/.sshcode-server"
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've made this directory change so it is similar to how .vscode-server stores itself. Also a lot of other tools do the same - nvm, npm, docker, cocoapods and etc.

Hopefully this will make sense.

Comment on lines +147 to +151
codeServerFlags := []string{
fmt.Sprintf("--bind-addr 127.0.0.1:%v", o.remotePort),
"--auth none",
}
codeServerCmdStr := fmt.Sprintf("%v/code-server %v %v", codeServerDir, dir, strings.Join(codeServerFlags, " "))
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change is mostly a groundwork for #178 which I will resubmit (with additional changes I've discovered necessary) after this PR get merged.

@gyzerok
Copy link
Author

gyzerok commented May 14, 2020

@nhooyr would you mind taking a look?

@Merith-TK
Copy link
Contributor

there is a button on the side that requests a reveiw. or down below here, i forgot

@gyzerok
Copy link
Author

gyzerok commented May 15, 2020

I do not see any button. There is a section on the right side, but I can't use it. Maybe you can because you have collaborator status?

@nhooyr
Copy link
Contributor

nhooyr commented May 18, 2020

@gyzerok Thanks for contributing, sorry for the late response.

I'll take a look at this soon.

@gyzerok
Copy link
Author

gyzerok commented May 18, 2020

It seems that after 3.3.0 update it got broken for my environment at least. So I invite you to help me figure out the most proper solution before we merge it. I am willing to incorporate any suggestions to make it the best experience for others.

Zero idea what it's about, but maybe you can help - Error: /lib/x86_64-linux-gnu/libc.so.6: version GLIBC_2.28' not found`.

@nhooyr
Copy link
Contributor

nhooyr commented May 18, 2020

See coder/code-server#1656

@nhooyr
Copy link
Contributor

nhooyr commented May 18, 2020

@gyzerok Can you hold off on further work here?

We're discussing deprecating sshcode in favour of a bash script that we maintain as part of code-server with most of the same functionality. I'll keep you posted on it. Don't want you to waste time on something that might not be merged.

@Merith-TK
Copy link
Contributor

@nhooyr
I would recommend making it an shell script instead of a bash script. As not all remote systems use bash, nor do all clients have bash installed.

@nhooyr
Copy link
Contributor

nhooyr commented May 18, 2020

@Merith-TK Yup, sorry I meant a shell script.

@gyzerok
Copy link
Author

gyzerok commented May 19, 2020

@nhooyr right now no further work is happening. I just have added ability to pass additional flags to the code-server and were planning to make it a separate PR.

Thanks for notifying me. Will be awaiting for you decision :)

@nhooyr
Copy link
Contributor

nhooyr commented May 20, 2020

See #185

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update code-server download to use new code-server v3 packaging
3 participants