Docker issues

.dockerignore

@@ -1 +1,12 @@
+.git
+.gitignore
 Dockerfile
+lib
+node_modules
+**/dist
+**/out
+.DS_Store
+*.DS_Store
+release
+**/yarn-error.log
+**/node_modules

.gitignore

@@ -4,3 +4,4 @@ dist
 out
 .DS_Store
 release
+yarn-error.log

Dockerfile

@@ -1,32 +1,47 @@
-FROM node:8.15.0
+FROM node:8.15.1
 
-# 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
+# This takes ages and always dies in the end. :(
+# RUN yarn --frozen-lockfile && yarn task build:server:binary
+
+
+# Make the debugging easier - and the rebuilds faster
+# and our life happier lets break up the build to sequential parts
+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
 
 # We deploy with ubuntu so that devs have a familiar environemnt.
 FROM ubuntu:18.10
 WORKDIR /root/project
-COPY --from=0 /src/packages/server/cli-linux /usr/local/bin/code-server
+
+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
+CMD code-server $PWD

build/tasks.ts

@@ -235,6 +235,11 @@ const ensureClean = register("vscode:clean", async (runner) => {
 
 	const status = await runner.execute("git", ["status", "--porcelain"]);
 	if (status.stdout.trim() !== "") {
+
+		// this is an uggly workaround - inside docker git clean throws an error message because of this directory
+		// related to git modules.
+		await runner.execute("rm", ["-rf", "node_modules/spdlog"]);
+
 		const clean = await runner.execute("git", ["clean", "-f", "-d", "-X"]);
 		if (clean.exitCode !== 0) {
 			throw new Error(`Failed to clean git repository: ${clean.stderr}`);

package.json

@@ -6,8 +6,8 @@
   "description": "Run VS Code remotely.",
   "scripts": {
     "build:rules": "cd ./rules && tsc -p .",
-    "packages:install": "cd ./packages && yarn",
-    "postinstall": "npm-run-all --parallel packages:install build:rules",
+    "packages:install": "cd ./packages && yarn --frozen-lockfile",
+    "postinstall": "npm-run-all packages:install build:rules",
     "start": "cd ./packages/server && yarn start",
     "task": "ts-node -r tsconfig-paths/register build/tasks.ts",
     "test": "cd ./packages && yarn test"