merge back codercom

Author: Zoltan

.github/CODEOWNERS

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

Dockerfile

@@ -1,35 +1,32 @@
 FROM node:8.9.3
 
 # Install VS Code's deps. These are the only two it seems we need.
-RUN apt-get update
-RUN apt-get install -y libxkbfile-dev libsecret-1-dev
+RUN apt-get update && apt-get install -y \
+	libxkbfile-dev \
+	libsecret-1-dev
 
 # Ensure latest yarn.
-RUN npm install -g yarn
-# In the future, we can use https://github.com/yarnpkg/rfcs/pull/53 to make it use the node_modules
-# directly which should be faster.
+RUN npm install -g yarn@1.13
+
 WORKDIR /src
 COPY . .
-RUN yarn --frozen-lockfile
-
-RUN yarn task vscode:install
-RUN yarn task build:copy-vscode
-RUN yarn task build:web
-RUN yarn task build:bootstrap-fork
-RUN yarn task build:default-extensions
-
 
-RUN yarn task build:server:bundle
-RUN yarn task build:app:browser
-RUN yarn task build:server:binary:package
+# 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 environemnt.
 FROM ubuntu:18.10
-RUN apt-get update
-RUN apt-get install -y openssl
-RUN apt-get install -y net-tools
 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
 # Unfortunately `.` does not work with code-server.
 CMD code-server $PWD

README.md

@@ -9,7 +9,7 @@
 
 Try it out:
 ```bash
-docker run -p localhost:8443:8443 -v "${PWD}:/root/project" codercom/code-server code-server --allow-http --no-auth
+docker run -p 127.0.0.1:8443:8443 -v "${PWD}:/root/project" codercom/code-server code-server --allow-http --no-auth
 ```
 
 - Code on your Chromebook, tablet, and laptop with a consistent dev environment.

packages/server/package.json

@@ -26,10 +26,12 @@
 		"@types/express": "^4.16.0",
 		"@types/fs-extra": "^5.0.4",
 		"@types/mime-types": "^2.1.0",
+		"@types/opn": "^5.1.0",
 		"@types/pem": "^1.9.4",
 		"@types/ws": "^6.0.1",
 		"fs-extra": "^7.0.1",
 		"nexe": "^2.0.0-rc.34",
+		"opn": "^5.4.0",
 		"string-replace-webpack-plugin": "^0.1.3",
 		"ts-node": "^7.0.1",
 		"tsconfig-paths": "^3.7.0",

packages/server/src/cli.ts

@@ -13,6 +13,7 @@ import { SharedProcess, SharedProcessState } from "./vscode/sharedProcess";
 import { setup as setupNativeModules } from "./modules";
 import { fillFs } from "./fill";
 import { isCli, serveStatic, buildDir } from "./constants";
+import opn = require("opn");
 
 export class Entry extends Command {
 	public static description = "Start your own self-hosted browser-accessible VS Code";
@@ -48,11 +49,11 @@ export class Entry extends Command {
 		}
 
 		const { args, flags } = this.parse(Entry);
-		const dataDir = flags["data-dir"] || path.join(os.homedir(), ".code-server");
-		const workingDir = args["workdir"];
+		const dataDir = path.resolve(flags["data-dir"] || path.join(os.homedir(), ".code-server"));
+		const workingDir = path.resolve(args["workdir"]);
 
 		setupNativeModules(dataDir);
-		const builtInExtensionsDir = path.join(buildDir || path.join(__dirname, ".."), "build/extensions");
+		const builtInExtensionsDir = path.resolve(buildDir || path.join(__dirname, ".."), "build/extensions");
 		if (flags["bootstrap-fork"]) {
 			const modulePath = flags["bootstrap-fork"];
 			if (!modulePath) {
@@ -83,8 +84,8 @@ export class Entry extends Command {
 		const logDir = path.join(dataDir, "logs", new Date().toISOString().replace(/[-:.TZ]/g, ""));
 		process.env.VSCODE_LOGS = logDir;
 
-		const certPath = flags.cert;
-		const certKeyPath = flags["cert-key"];
+		const certPath = flags.cert ? path.resolve(flags.cert) : undefined;
+		const certKeyPath = flags["cert-key"] ? path.resolve(flags["cert-key"]) : undefined;
 
 		if (certPath && !certKeyPath) {
 			logger.error("'--cert-key' flag is required when specifying a certificate!");
@@ -134,9 +135,9 @@ export class Entry extends Command {
 			}
 		});
 
-		let password = flags["password"];
+		let password = flags.password;
 		if (!password) {
-			// Generate a random password
+			// Generate a random password with a length of 24.
 			const buffer = Buffer.alloc(12);
 			randomFillSync(buffer);
 			password = buffer.toString("hex");
@@ -157,7 +158,7 @@ export class Entry extends Command {
 				// If we're not running from the binary and we aren't serving the static
 				// pre-built version, use webpack to serve the web files.
 				if (!isCli && !serveStatic) {
-					const webpackConfig = require(path.join(__dirname, "..", "..", "web", "webpack.config.js"));
+					const webpackConfig = require(path.resolve(__dirname, "..", "..", "web", "webpack.config.js"));
 					const compiler = require("webpack")(webpackConfig);
 					app.use(require("webpack-dev-middleware")(compiler, {
 						logger,
@@ -220,10 +221,20 @@ export class Entry extends Command {
 		} else {
 			logger.warn("Launched without authentication.");
 		}
+
+		const url = `http://localhost:${flags.port}/`;
 		logger.info(" ");
 		logger.info("Started (click the link below to open):");
-		logger.info(`http://localhost:${flags.port}/`);
+		logger.info(url);
 		logger.info(" ");
+
+		if (flags["open"]) {
+			try {
+				await opn(url);
+			} catch (e) {
+				logger.warn("Url couldn't be opened automatically.", field("url", url), field("exception", e));
+			}
+		}
 	}
 }
 

packages/server/src/constants.ts

@@ -1,3 +1,5 @@
+import * as path from "path";
+
 export const isCli = typeof process.env.CLI !== "undefined" && process.env.CLI !== "false";
 export const serveStatic = typeof process.env.SERVE_STATIC !== "undefined" && process.env.SERVE_STATIC !== "false";
-export const buildDir = process.env.BUILD_DIR;
+export const buildDir = process.env.BUILD_DIR ? path.resolve(process.env.BUILD_DIR) : "";

packages/server/yarn.lock

@@ -128,6 +128,13 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-11.10.5.tgz#fbaca34086bdc118011e1f05c47688d432f2d571"
   integrity sha512-DuIRlQbX4K+d5I+GMnv+UfnGh+ist0RdlvOp+JZ7ePJ6KQONCFQv/gKYSU1ZzbVdFSUCKZOltjmpFAGGv5MdYA==
 
+"@types/opn@^5.1.0":
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/@types/opn/-/opn-5.1.0.tgz#bff7bc371677f4bdbb37884400e03fd81f743927"
+  integrity sha512-TNPrB7Y1xl06zDI0aGyqkgxjhIev3oJ+cdqlZ52MTAHauWpEL/gIUdHebIfRHFZk9IqSBpE2ci1DT48iZH81yg==
+  dependencies:
+    "@types/node" "*"
+
 "@types/pem@^1.9.4":
   version "1.9.5"
   resolved "https://registry.yarnpkg.com/@types/pem/-/pem-1.9.5.tgz#cd5548b5e0acb4b41a9e21067e9fcd8c57089c99"
@@ -2654,6 +2661,13 @@ onetime@^2.0.0:
   dependencies:
     mimic-fn "^1.0.0"
 
+opn@^5.4.0:
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/opn/-/opn-5.4.0.tgz#cb545e7aab78562beb11aa3bfabc7042e1761035"
+  integrity sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==
+  dependencies:
+    is-wsl "^1.1.0"
+
 optionator@^0.8.1:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"