Merge remote-tracking branch 'upstream/master'

* upstream/master: (35 commits)
  Dockerfile: use relative path instead of $PWD for CMD
  Update docker oneliner and fix clone task
  Clone exact vscode release branch when build task (coder#167)
  Add -t flag to docker example (coder#181)
  Reverts parts of my last PR (coder#177)
  Fix build and Dockerfile issues (coder#176)
  Add nginx reverse proxy guide for selfhosted
  Use a timing-safe equality check for passwords (coder#133)
  Open websocket on same path as page (coder#149)
  Adhere to XDG base directory spec for dataDir and logDir (coder#156)
  Improve github issue template (coder#162)
  Fix typo: environemnt -> environment (coder#159)
  Add back web class
  Move upx compression behind an env flag
  ci: enable travis npm cache (coder#110)
  Improve .dockerignore (coder#111)
  Feature/1.32.0 update (coder#117)
  Update grammar on README (coder#139)
  inital -> initial (coder#135)
  Handle arch in dockerfile and add PR template (coder#109)
  ...

Author: andreimc

.dockerignore

@@ -0,0 +1,9 @@
+Dockerfile
+# Docs
+doc/
+# GitHub stuff
+.github
+.gitignore
+.travis.yml
+LICENSE
+README.md

.github/CODEOWNERS

@@ -1 +1,2 @@
-* @coderasher @kylecarbs
+* @coderasher @kylecarbs
+Dockerfile @nhooyr

.github/ISSUE_TEMPLATE/bug_report.md

@@ -2,7 +2,7 @@
 name: Bug Report
 about: Report problems and unexpected behavior.
 title: ''
-labels: ''
+labels: 'bug'
 assignees: ''
 ---
 
@@ -12,7 +12,11 @@ assignees: ''
 - `code-server` version: <!-- The version of code-server -->
 - OS Version: <!-- OS version, cloud provider,  -->
 
-#### Steps to Reproduce
+## Description
 
-1.
-2.
+<!-- Describes the problem here -->
+
+## Steps to Reproduce
+
+1. <!-- step 1: click ... -->
+1. <!-- step 2: ... -->

.github/ISSUE_TEMPLATE/extension_bug.md

@@ -12,7 +12,11 @@ assignees: ''
 - OS Version: <!-- OS version, cloud provider,  -->
 - Extension: <!-- Link to extension -->
 
-#### Steps to Reproduce
+## Description
 
-1.
-2.
+<!-- Describes the problem here -->
+
+## Steps to Reproduce
+
+1. <!-- step 1: click ... -->
+1. <!-- step 2: ... -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -2,7 +2,7 @@
 name: Feature Request
 about: Suggest an idea for this project.
 title: ''
-labels: ''
+labels: 'feature'
 assignees: ''
 ---
 

.github/ISSUE_TEMPLATE/question.md

@@ -2,16 +2,16 @@
 name: Question
 about: Ask a question.
 title: ''
-labels: ''
+labels: 'question'
 assignees: ''
 ---
 
 <!-- Please search existing issues to avoid creating duplicates. -->
 
-#### Description
+## Description
 
 <!-- A description of the the question. -->
 
-#### Related Issues
+## Related Issues
 
 <!-- Any issues related to your question. -->

.github/pull_request_template.md

@@ -0,0 +1,6 @@
+<!-- Please answer these questions before submitting your PR. Thanks! -->
+
+### Describe in detail the problem you had and how this PR fixes it
+
+### Is there an open issue you can link to?
+

.gitignore

@@ -3,3 +3,4 @@ node_modules
 dist
 out
 .DS_Store
+release

.travis.yml

@@ -1,6 +1,11 @@
 language: node_js
 node_js:
-- 8.9.3
+- 8.15.0
+env:
+  global:
+    secure: gf/3J6XEFhEbaWesAaGtjvcMCmt07ztiIzHPzJuZXp5GIxImmZJk+F1ZNWSYcw2X7jcpyj20NvWUigX7FvzRE5L7LPEbzNugVLYHjw7YSzqtAacMnmOYmMnhjzed8mWmGjwEKiDy1qWQq/b+2GWuR5LH74/pEYF0/3M5XwEvQFGleZ1CVdemTeHBgjvAye6jBtOvJXijEprfiFbaNvWLgecwBtIlW76J9t+SEPWGe29nMNvMJl6rYvsT8sTnsTc2tL2v6kOpSTb3KgIyGPSajVJQ8v2JjlDIVUMPRObVfHQ979B3WkMfkL+zuy9rbxXAT/FDZwuV15nN33OoONDl+uql200zpBk6Co7SQEanH1bUu1SiyowQ3dH5cYm+dOd+Xep06e/79UjzAyw08ok6nqHEraotwZUjh0wILiaX4EU72x1apyDPxCnFUUyKpH7MMxI/OUMMSrVOThBLJS+ZcRCQ3EPL8yEHwJ2wKfB6xnbaX/ctUhcSi15GcC5ZyfS12KHOwHgeasheKvOSjrzZV1pxVn+7BG8sr/LwnzUbC7CiBoAYzv/9e+kfVXhgIdRq75zRltJLVQQQU9Bk32iOjprxiK8XO5VBfwGKCtMGTrBbb8Q1sXgTOyoxvfR5hIKlnPu5gF4mCsCt9Jll496pzQnKhzEvTt3SM/02/5YpQjw=
+  matrix:
+    - VERSION="1.32.0-$TRAVIS_BUILD_NUMBER"
 matrix:
   include:
   - os: linux
@@ -12,11 +17,11 @@ before_install:
 script:
 - scripts/build.sh
 before_deploy:
-- export TRAVIS_TAG="1.31.0-$TRAVIS_BUILD_NUMBER"
-- echo "$TRAVIS_TAG" "$TRAVIS_COMMIT"
+- echo "$VERSION" "$TRAVIS_COMMIT"
 - git config --local user.name "$USER_NAME"
 - git config --local user.email "$USER_EMAIL"
-- git tag "$TRAVIS_TAG" "$TRAVIS_COMMIT"
+- git tag "$VERSION" "$TRAVIS_COMMIT"
+- yarn task package "$VERSION"
 deploy:
   provider: releases
   file_glob: true
@@ -27,9 +32,9 @@ deploy:
   skip_cleanup: true
   api_key:
     secure: vZSm/8u50ZJvg1/wl/Lx4Noa8t1L3/zzTlnCmusWkr7CVgymN25cBTGW9X73waBFDszCAO+dswDmMjs44V/7/9Wfnkvk7xjUe7f+AhNhH1d8jomDQKQr9Xja6sgBo/ugMdqzIgJuMkaF/P1Y3S28GJJj7aJiMUMHvBw9NE2q4PBQ9HZcFJr1mkEgsKi4MofECUNCSVsnkMWigNBs1WNWMPOqmcl8npKV79o+t2OVc9EK4k9urLrg+XFFgB/oXeSoiB9X1UH0pXufN/JmiIMzQtlV9aHdAT+09LzqyFVZN1CmnPLZwqqtJCYwco5eDGrBBTPjtwTNXH9EH/uADk1iqQel4hIqkMD9MbZEkBg+JOWmbTqYXBrk+Y02dxhjfXMyp8YZOqp+nv78phRmjOp6FG7hPK3vDNScaqj3ASWeRLy0KDc5Jluw+LfP7K69zYevNQ0KyD1ug0XduFdtotE5SJVLS9KOouWY6wu/80hQg/BPqNGl+4HVC6Zdn6EWT8FTIBlCOlyNUJVfLlJgGsUPgkSPUd5pCnFpymvZYcqpzNP6RVmkkBxlSP9nV2cf8YytQy6k0zduPOdbbcVj4f8+1Nqeq9veQ3mv42Yi29O4QopPQ/o3bVSz2ooQSnXG/7+k8pgq1FUrHXKic8VDEUAnubfn9iNgke0hFqc1RCOx0kU=
-  file: packages/server/cli-*
+  file:
+    - release/*.tar.gz
+    - release/*.zip
   on:
     repo: devbox-hero/code-server
-env:
-  global:
-    secure: gf/3J6XEFhEbaWesAaGtjvcMCmt07ztiIzHPzJuZXp5GIxImmZJk+F1ZNWSYcw2X7jcpyj20NvWUigX7FvzRE5L7LPEbzNugVLYHjw7YSzqtAacMnmOYmMnhjzed8mWmGjwEKiDy1qWQq/b+2GWuR5LH74/pEYF0/3M5XwEvQFGleZ1CVdemTeHBgjvAye6jBtOvJXijEprfiFbaNvWLgecwBtIlW76J9t+SEPWGe29nMNvMJl6rYvsT8sTnsTc2tL2v6kOpSTb3KgIyGPSajVJQ8v2JjlDIVUMPRObVfHQ979B3WkMfkL+zuy9rbxXAT/FDZwuV15nN33OoONDl+uql200zpBk6Co7SQEanH1bUu1SiyowQ3dH5cYm+dOd+Xep06e/79UjzAyw08ok6nqHEraotwZUjh0wILiaX4EU72x1apyDPxCnFUUyKpH7MMxI/OUMMSrVOThBLJS+ZcRCQ3EPL8yEHwJ2wKfB6xnbaX/ctUhcSi15GcC5ZyfS12KHOwHgeasheKvOSjrzZV1pxVn+7BG8sr/LwnzUbC7CiBoAYzv/9e+kfVXhgIdRq75zRltJLVQQQU9Bk32iOjprxiK8XO5VBfwGKCtMGTrBbb8Q1sXgTOyoxvfR5hIKlnPu5gF4mCsCt9Jll496pzQnKhzEvTt3SM/02/5YpQjw=
+cache: yarn

Dockerfile

@@ -0,0 +1,32 @@
+FROM node:8.15.0
+
+# Install VS Code's deps. These are the only two it seems we need.
+RUN apt-get update && apt-get install -y \
+	libxkbfile-dev \
+	libsecret-1-dev
+
+# Ensure latest yarn.
+RUN npm install -g [email protected]
+
+WORKDIR /src
+COPY . .
+
+# In the future, we can use https://github.com/yarnpkg/rfcs/pull/53 to make yarn use the node_modules
+# directly which should be fast as it is slow because it populates its own cache every time.
+RUN yarn && yarn task build:server:binary
+
+# We deploy with ubuntu so that devs have a familiar environment.
+FROM ubuntu:18.10
+WORKDIR /root/project
+COPY --from=0 /src/packages/server/cli-linux-x64 /usr/local/bin/code-server
+EXPOSE 8443
+RUN apt-get update && apt-get install -y \
+	openssl \
+	net-tools
+RUN apt-get install -y locales && \
+	locale-gen en_US.UTF-8
+# We unfortunately cannot use update-locale because docker will not use the env variables
+# configured in /etc/default/locale so we need to set it manually.
+ENV LANG=en_US.UTF-8
+ENTRYPOINT code-server
+CMD ["."]

README.md

@@ -5,21 +5,39 @@
 [![MIT license](https://img.shields.io/badge/license-MIT-green.svg)](#)
 [![Discord](https://discordapp.com/api/guilds/463752820026376202/widget.png)](https://discord.gg/zxSwN8Z)
 
-`code-server` is VS Code running on a remote server, accessible through the browser.
+`code-server` is [VS Code](https://github.com/Microsoft/vscode) running on a remote server, accessible through the browser.
+
+Try it out:
+```bash
+docker run -t -p 127.0.0.1:8443:8443 -v "${PWD}:/root/project" codercom/code-server --allow-http --no-auth
+```
+
+- Code on your Chromebook, tablet, and laptop with a consistent dev environment.
+	- If you have a Windows or Mac workstation, more easily develop for Linux.
+- Take advantage of large cloud servers to speed up tests, compilations, downloads, and more.
+- Preserve battery life when you're on the go.
+	- All intensive computation runs on your server.
+	- You're no longer running excess instances of Chrome.
 
 ![Screenshot](/doc/assets/ide.png)
 
 ## Getting Started
 
+### Hosted
+
 [Try `code-server` now](https://coder.com/signup) for free at coder.com.
 
-**OR**
+### Docker
+
+See docker oneliner mentioned above. Dockerfile is at [/Dockerfile](/Dockerfile).
+
+### Binaries
 
 1.  [Download a binary](https://github.com/codercom/code-server/releases) (Linux and OSX supported. Windows coming soon)
 2.  Start the binary with the project directory as the first argument
 
     ```
-    code-server <inital directory to open>
+    code-server <initial directory to open>
     ```
 	> You will be prompted to enter the password shown in the CLI
 	`code-server` should now be running at https://localhost:8443.
@@ -36,7 +54,7 @@ How to [secure your setup](/doc/security/ssl.md).
 
 ### Known Issues
 
-- Debugging extensions doesn’t work.
+- Creating custom VS Code extensions and debugging them doesn't work.
 
 ### Future
 
@@ -46,15 +64,15 @@ How to [secure your setup](/doc/security/ssl.md).
 
 ## Contributing
 
-Guides on setup for development will be coming soon. :)
+Development guides are coming soon.
 
 ## License
 
 [MIT](LICENSE)
 
 ## Enterprise
 
-Visit [our enterprise page](https://coder.com/enterprise) for more information on our enterprise offering.
+Visit [our enterprise page](https://coder.com/enterprise) for more information about our enterprise offering.
 
 ## Commercialization
 

build/tasks.ts

@@ -10,6 +10,7 @@ const libPath = path.join(__dirname, "../lib");
 const vscodePath = path.join(libPath, "vscode");
 const pkgsPath = path.join(__dirname, "../packages");
 const defaultExtensionsPath = path.join(libPath, "VSCode-linux-x64/resources/app/extensions");
+const vscodeVersion = "1.32";
 
 const buildServerBinary = register("build:server:binary", async (runner) => {
 	await ensureInstalled();
@@ -40,22 +41,24 @@ const buildServerBinaryPackage = register("build:server:binary:package", async (
 });
 
 const dependencyNexeBinary = register("dependency:nexe", async (runner) => {
-	if (os.platform() === "linux") {
+	if (os.platform() === "linux" && process.env.COMPRESS === "true") {
+		// Download the nexe binary so we can compress it before nexe runs. If we
+		// don't want compression we don't need to do anything since nexe will take
+		// care of getting the binary.
 		const nexeDir = path.join(os.homedir(), ".nexe");
 		const targetBinaryName = `${os.platform()}-${os.arch()}-${process.version.substr(1)}`;
 		const targetBinaryPath = path.join(nexeDir, targetBinaryName);
 		if (!fs.existsSync(targetBinaryPath)) {
-			/**
-			 * We create a binary with nexe
-			 * so we can compress it
-			 */
 			fse.mkdirpSync(nexeDir);
 			runner.cwd = nexeDir;
 			await runner.execute("wget", [`https://github.com/nexe/nexe/releases/download/v3.0.0-beta.15/${targetBinaryName}`]);
 			await runner.execute("chmod", ["+x", targetBinaryPath]);
 		}
+		// Compress with upx if it doesn't already look compressed.
 		if (fs.statSync(targetBinaryPath).size >= 20000000) {
-			// Compress w/ upx
+			// It needs to be executable for upx to work, which it might not be if
+			// nexe downloaded it.
+			fs.chmodSync(targetBinaryPath, "755");
 			const upxFolder = path.join(os.tmpdir(), "upx");
 			const upxBinary = path.join(upxFolder, "upx");
 			if (!fs.existsSync(upxBinary)) {
@@ -194,7 +197,7 @@ const buildDefaultExtensions = register("build:default-extensions", async (runne
 	if (!fs.existsSync(defaultExtensionsPath)) {
 		await copyForDefaultExtensions();
 		runner.cwd = extDirPath;
-		const resp = await runner.execute(isWin ? "npx.cmd" : "npx", [isWin ? "gulp.cmd" : "gulp", "vscode-linux-x64"]);
+		const resp = await runner.execute(isWin ? "npx.cmd" : "npx", [isWin ? "gulp.cmd" : "gulp", "vscode-linux-x64", "--max-old-space-size=32384"]);
 		if (resp.exitCode !== 0) {
 			throw new Error(`Failed to build default extensions: ${resp.stderr}`);
 		}
@@ -217,17 +220,11 @@ const ensureCloned = register("vscode:clone", async (runner) => {
 	} else {
 		fse.mkdirpSync(libPath);
 		runner.cwd = libPath;
-		const clone = await runner.execute("git", ["clone", "https://github.com/microsoft/vscode"]);
+		const clone = await runner.execute("git", ["clone", "https://github.com/microsoft/vscode", "--branch", `release/${vscodeVersion}`, "--single-branch", "--depth=1"]);
 		if (clone.exitCode !== 0) {
 			throw new Error(`Failed to clone: ${clone.exitCode}`);
 		}
 	}
-
-	runner.cwd = vscodePath;
-	const checkout = await runner.execute("git", ["checkout", "tags/1.31.0"]);
-	if (checkout.exitCode !== 0) {
-		throw new Error(`Failed to checkout: ${checkout.stderr}`);
-	}
 });
 
 const ensureClean = register("vscode:clean", async (runner) => {
@@ -244,6 +241,10 @@ const ensureClean = register("vscode:clean", async (runner) => {
 			throw new Error(`Failed to remove unstaged files: ${removeUnstaged.stderr}`);
 		}
 	}
+	const fetch = await runner.execute("git", ["fetch", "--prune"]);
+	if (fetch.exitCode !== 0) {
+		throw new Error(`Failed to fetch latest changes: ${fetch.stderr}`);
+	}
 });
 
 const ensurePatched = register("vscode:patch", async (runner) => {
@@ -260,4 +261,30 @@ const ensurePatched = register("vscode:patch", async (runner) => {
 	}
 });
 
+register("package", async (runner, releaseTag) => {
+	if (!releaseTag) {
+		throw new Error("Please specify the release tag.");
+	}
+
+	const releasePath = path.resolve(__dirname, "../release");
+
+	const archiveName = `code-server-${releaseTag}-${os.platform()}-${os.arch()}`;
+	const archiveDir = path.join(releasePath, archiveName);
+	fse.removeSync(archiveDir);
+	fse.mkdirpSync(archiveDir);
+
+	const binaryPath = path.join(__dirname, `../packages/server/cli-${os.platform()}-${os.arch()}`);
+	const binaryDestination = path.join(archiveDir, "code-server");
+	fse.copySync(binaryPath, binaryDestination);
+	fs.chmodSync(binaryDestination, "755");
+	["README.md", "LICENSE"].forEach((fileName) => {
+		fse.copySync(path.resolve(__dirname, `../${fileName}`), path.join(archiveDir, fileName));
+	});
+
+	runner.cwd = releasePath;
+	await os.platform() === "linux"
+		? runner.execute("tar", ["-cvzf", `${archiveName}.tar.gz`, `${archiveName}`])
+		: runner.execute("zip", ["-r", `${archiveName}.zip`, `${archiveName}`]);
+});
+
 run();