Merge branch 'master' into sr229/travis-arm

Author: Ayane Satomi

.travis.yml

@@ -8,7 +8,7 @@ before_install:
   - export MAJOR_VERSION="2"
   - export VSCODE_VERSION="1.39.2"
   - export VERSION="$MAJOR_VERSION.$TRAVIS_BUILD_NUMBER"
-  - export TAG="$VERSION-vsc$VSCODE_VERSION-$(uname -m)"
+  - export TAG="$VERSION-vsc$VSCODE_VERSION"
   - if [[ "$TRAVIS_BRANCH" == "master" ]]; then export MINIFY="true"; fi
   - if [[ "$TRAVIS_BRANCH" == "master" ]]; then export PACKAGE="true"; fi
 
@@ -19,7 +19,7 @@ jobs:
       os: linux
       arch: amd64
       dist: trusty
-      env: TARGET="linux"
+      env: TARGET="linux" PUSH_DOCKER="true"
       if: tag IS blank
       script: scripts/ci.bash
     - name: "Alpine build - x86_64"
@@ -70,7 +70,7 @@ before_deploy:
   - git config --local user.name "$USER_NAME"
   - git config --local user.email "$USER_EMAIL"
   - if ! git tag "$TAG" "$TRAVIS_COMMIT" ; then echo "$TAG already exists"; fi
-  - if [[ -n "$DOCKER_BUILD" ]] ; then echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin ; fi
+  - if [[ -n "$PUSH_DOCKER" ]] ; then echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin ; fi
 
 deploy:
   - provider: releases
@@ -91,11 +91,11 @@ deploy:
 
   - provider: script
     skip_cleanup: true
-    script: docker push codercom/code-server:"$TAG" ; docker push codercom/code-server:v2
+    script: docker build -f ./scripts/ci.dockerfile --build-arg -t codercom/code-server:"$TAG" -t codercom/code-server:v2 . && docker push codercom/code-server:"$TAG" && docker push codercom/code-server:v2
     on:
       repo: cdr/code-server
       branch: master
-      condition: -n "$DOCKER_BUILD"
+      condition: -n "$PUSH_DOCKER"
 
 cache:
   yarn: true

README.md

@@ -58,6 +58,10 @@ arguments when launching code-server with Docker. See
 
 ### Build
 
+See
+[VS Code prerequisites](https://github.com/Microsoft/vscode/wiki/How-to-Contribute#prerequisites)
+before building.
+
 ```shell
 export OUT=/path/to/output/build                  # Optional if only building. Required if also developing.
 yarn build ${vscodeVersion} ${codeServerVersion}  # See travis.yml for the VS Code version to use.
@@ -102,6 +106,10 @@ data collected to improve code-server.
 
 ### Development
 
+See
+[VS Code prerequisites](https://github.com/Microsoft/vscode/wiki/How-to-Contribute#prerequisites)
+before developing.
+
 ```shell
 git clone https://github.com/microsoft/vscode
 cd vscode

scripts/build.ts

@@ -158,21 +158,28 @@ class Builder {
 		});
 
 		// Download and prepare VS Code if necessary (should be cached by CI).
-		const exists = fs.existsSync(vscodeSourcePath);
-		if (exists) {
-			this.log("Using existing VS Code directory");
+		if (fs.existsSync(vscodeSourcePath)) {
+			this.log("Using existing VS Code clone");
 		} else {
 			await this.task("Cloning VS Code", () => {
 				return util.promisify(cp.exec)(
 					"git clone https://github.com/microsoft/vscode"
 						+ ` --quiet --branch "${vscodeVersion}"`
 						+ ` --single-branch --depth=1 "${vscodeSourcePath}"`);
 			});
+		}
 
+		if (fs.existsSync(path.join(vscodeSourcePath, "node_modules"))) {
+			this.log("Using existing VS Code node_modules");
+		} else {
 			await this.task("Installing VS Code dependencies", () => {
 				return util.promisify(cp.exec)("yarn", { cwd: vscodeSourcePath });
 			});
+		}
 
+		if (fs.existsSync(path.join(vscodeSourcePath, ".build/extensions"))) {
+			this.log("Using existing built-in-extensions");
+		} else {
 			await this.task("Building default extensions", () => {
 				return util.promisify(cp.exec)(
 					"yarn gulp compile-extensions-build --max-old-space-size=32384",
@@ -296,8 +303,16 @@ class Builder {
 			]);
 		});
 
-		// This is so it doesn't get cached along with VS Code (no point).
-		await this.task("Removing copied server", () => fs.remove(serverPath));
+		// This is so it doesn't get cached along with VS Code. There's no point
+		// since there isn't anything like an incremental build.
+		await this.task("Removing build files for smaller cache", () => {
+			return Promise.all([
+				fs.remove(serverPath),
+				fs.remove(path.join(vscodeSourcePath, "out-vscode")),
+				fs.remove(path.join(vscodeSourcePath, "out-vscode-min")),
+				fs.remove(path.join(vscodeSourcePath, "out-build")),
+			]);
+		});
 
 		// Prepend code to the target which enables finding files within the binary.
 		const prependLoader = async (relativeFilePath: string): Promise<void> => {
@@ -326,19 +341,25 @@ class Builder {
 			]);
 		});
 
-		// TODO: fix onigasm dep
-		// # onigasm 2.2.2 has a bug that makes it broken for PHP files so use 2.2.1.
-		// # https://github.com/NeekSandhu/onigasm/issues/17
-		// function fix-onigasm() {
-		// 	local onigasmPath="${buildPath}/node_modules/onigasm-umd"
-		// 	rm -rf "${onigasmPath}"
-		// 	git clone "https://github.com/alexandrudima/onigasm-umd" "${onigasmPath}"
-		// 	cd "${onigasmPath}" && yarn && yarn add --dev [email protected] && yarn package
-		// 	mkdir "${onigasmPath}-temp"
-		// 	mv "${onigasmPath}/"{release,LICENSE} "${onigasmPath}-temp"
-		// 	rm -rf "${onigasmPath}"
-		// 	mv "${onigasmPath}-temp" "${onigasmPath}"
-		// }
+		// onigasm 2.2.2 has a bug that makes it broken for PHP files so use 2.2.1.
+		// https://github.com/NeekSandhu/onigasm/issues/17
+		await this.task("Applying onigasm PHP fix", async () => {
+			const onigasmPath = path.join(finalBuildPath, "node_modules/onigasm-umd");
+			const onigasmTmpPath = `${onigasmPath}-temp`;
+			await Promise.all([
+				fs.remove(onigasmPath),
+				fs.mkdir(onigasmTmpPath),
+			]);
+			await util.promisify(cp.exec)(`git clone "https://github.com/alexandrudima/onigasm-umd" "${onigasmPath}"`);
+			await util.promisify(cp.exec)("yarn", { cwd: onigasmPath });
+			await util.promisify(cp.exec)("yarn add --dev [email protected]", { cwd: onigasmPath });
+			await util.promisify(cp.exec)("yarn package", { cwd: onigasmPath });
+			await Promise.all(["release", "LICENSE", "package.json"].map((fileName) => {
+				return fs.copy(path.join(onigasmPath, fileName), path.join(onigasmTmpPath, fileName));
+			}));
+			await fs.remove(onigasmPath);
+			await fs.move(onigasmTmpPath, onigasmPath);
+		});
 
 		this.log(`Final build: ${finalBuildPath}`);
 	}

scripts/ci.dockerfile

@@ -0,0 +1,37 @@
+# We deploy with ubuntu so that devs have a familiar environment.
+FROM ubuntu:18.04
+
+RUN apt-get update && apt-get install -y \
+	openssl \
+	net-tools \
+	git \
+	locales \
+	sudo \
+	dumb-init \
+	vim \
+	curl \
+	wget
+
+RUN locale-gen en_US.UTF-8
+# We 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 LC_ALL=en_US.UTF-8
+
+RUN adduser --gecos '' --disabled-password coder && \
+	echo "coder ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers.d/nopasswd
+
+USER coder
+# We create first instead of just using WORKDIR as when WORKDIR creates, the
+# user is root.
+RUN mkdir -p /home/coder/project
+
+WORKDIR /home/coder/project
+
+# This ensures we have a volume mounted even if the user forgot to do bind
+# mount. So that they do not lose their data if they delete the container.
+VOLUME [ "/home/coder/project" ]
+
+COPY ./binaries/code-server* /usr/local/bin/code-server
+EXPOSE 8080
+
+ENTRYPOINT ["dumb-init", "code-server", "--host", "0.0.0.0"]

scripts/optimize.js

@@ -23,15 +23,14 @@ const vscodeResources = [
 	"out-build/vs/server/main.js",
 	"out-build/vs/server/src/node/uriTransformer.js",
 	"!out-build/vs/server/doc/**",
-	"out-build/vs/code/browser/workbench/**",
-	"out-build/vs/server/src/browser/*.html",
 	"out-build/vs/server/src/media/*",
 	"out-build/vs/workbench/services/extensions/worker/extensionHostWorkerMain.js",
 	"out-build/bootstrap.js",
 	"out-build/bootstrap-fork.js",
 	"out-build/bootstrap-amd.js",
 	"out-build/paths.js",
-	"out-build/vs/**/*.{svg,png}",
+	'out-build/vs/**/*.{svg,png,html}',
+	"!out-build/vs/code/browser/workbench/*.html",
 	'!out-build/vs/code/electron-browser/**',
 	"out-build/vs/base/common/performance.js",
 	"out-build/vs/base/node/languagePacks.js",