From 925952dd6883821bafa93085b28bc07334a3c6ff Mon Sep 17 00:00:00 2001
From: Lukas Herman <lherman.cs@gmail.com>
Date: Sat, 9 Mar 2019 13:41:09 -0500
Subject: [PATCH 1/2] Removed hard coded arch values

---
 build/tasks.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build/tasks.ts b/build/tasks.ts
index bd316e3747ff..e66a204bf804 100644
--- a/build/tasks.ts
+++ b/build/tasks.ts
@@ -9,7 +9,7 @@ const isWin = os.platform() === "win32";
 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 defaultExtensionsPath = path.join(libPath, `VSCode-linux-${os.arch()}/resources/app/extensions`);
 
 const buildServerBinary = register("build:server:binary", async (runner) => {
 	await ensureInstalled();
@@ -63,7 +63,7 @@ const dependencyNexeBinary = register("dependency:nexe", async (runner) => {
 			if (!fs.existsSync(upxBinary)) {
 				fse.mkdirpSync(upxFolder);
 				runner.cwd = upxFolder;
-				const upxExtract = await runner.execute("bash", ["-c", "curl -L https://github.com/upx/upx/releases/download/v3.95/upx-3.95-amd64_linux.tar.xz | tar xJ --strip-components=1"]);
+				const upxExtract = await runner.execute("bash", ["-c", `curl -L https://github.com/upx/upx/releases/download/v3.95/upx-3.95-${os.arch()}_linux.tar.xz | tar xJ --strip-components=1`]);
 				if (upxExtract.exitCode !== 0) {
 					throw new Error(`Failed to extract upx: ${upxExtract.stderr}`);
 				}
@@ -196,7 +196,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", "--max-old-space-size=32384"]);
+		const resp = await runner.execute(isWin ? "npx.cmd" : "npx", [isWin ? "gulp.cmd" : "gulp", `vscode-linux-${os.arch()}`, "--max-old-space-size=32384"]);
 		if (resp.exitCode !== 0) {
 			throw new Error(`Failed to build default extensions: ${resp.stderr}`);
 		}

From ca1f3ab6cff0f44891a22ff9d70317dcb2a6173d Mon Sep 17 00:00:00 2001
From: Lukas Herman <lherman.cs@gmail.com>
Date: Sat, 9 Mar 2019 13:46:42 -0500
Subject: [PATCH 2/2] Fixed copying wrong cli binary

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index d2b7972e67d0..3b9754a2ed42 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,7 @@ 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
+COPY --from=0 /src/packages/server/cli-linux-arm64 /usr/local/bin/code-server
 EXPOSE 8443
 RUN apt-get update && apt-get install -y \
 	openssl \