Merge branch 'master' into service

Author: nhooyr

.github/pull_request_template.md

@@ -1,4 +1,6 @@
 <!--
 Please link to the issue this PR solves.
 If there is no existing issue, please first create one unless the fix is minor.
+
+Please make sure the base of your PR is the master branch!
 -->

ci/build/clean.sh

@@ -5,16 +5,15 @@ main() {
   cd "$(dirname "${0}")/../.."
   source ./ci/lib.sh
 
-  rm -Rf \
+  rm -rf \
     out \
     release \
     release-standalone \
     release-packages \
     release-gcp \
-    release-images/ \
+    release-images \
     dist \
-    .tsbuildinfo \
-    .cache/out.tsbuildinfo
+    .cache
 
   pushd lib/vscode
   git clean -xffd

ci/dev/vscode.patch

@@ -226,7 +226,7 @@ index da4fa3e9d0..50f3e1144f 100644
 
  function processLib() {
 diff --git a/package.json b/package.json
-index e52e3ff548..2f3b55398b 100644
+index 226f51a1ec..5c4e5af5f6 100644
 --- a/package.json
 +++ b/package.json
 @@ -45,7 +45,11 @@
@@ -265,9 +265,7 @@ index e52e3ff548..2f3b55398b 100644
 +  "resolutions": {
 +    "minimist": "^1.2.5"
    }
--}
-\ No newline at end of file
-+}
+ }
 diff --git a/product.json b/product.json
 index 2b884d18f3..518b935b83 100644
 --- a/product.json

ci/images/centos7/Dockerfile

@@ -1,9 +1,10 @@
 FROM centos:7
 
+ARG NODE_VERSION=v12.18.3
 RUN ARCH="$(uname -m | sed 's/86_64/64/; s/aarch64/arm64/')" && \
-    curl -fsSL "https://nodejs.org/dist/v14.4.0/node-v14.4.0-linux-$ARCH.tar.xz" | tar -C /usr/local -xJ && \
-    mv /usr/local/node-v14.4.0-linux-$ARCH /usr/local/node-v14.4.0
-ENV PATH=/usr/local/node-v14.4.0/bin:$PATH
+    curl -fsSL "https://nodejs.org/dist/$NODE_VERSION/node-$NODE_VERSION-linux-$ARCH.tar.xz" | tar -C /usr/local -xJ && \
+    mv "/usr/local/node-$NODE_VERSION-linux-$ARCH" "/usr/local/node-$NODE_VERSION"
+ENV PATH=/usr/local/node-$NODE_VERSION/bin:$PATH
 RUN npm install -g yarn
 
 RUN yum groupinstall -y 'Development Tools'

ci/images/debian8/Dockerfile

@@ -6,7 +6,7 @@ RUN apt-get update
 RUN apt-get install -y curl gnupg
 
 # Installs node.
-RUN curl -fsSL https://deb.nodesource.com/setup_14.x | bash - && \
+RUN curl -fsSL https://deb.nodesource.com/setup_12.x | bash - && \
     apt-get install -y nodejs
 
 # Installs yarn.

ci/steps/release-packages.sh

@@ -5,8 +5,9 @@ main() {
   cd "$(dirname "$0")/../.."
 
   if [[ $OSTYPE == darwin* ]]; then
-    curl -L https://nodejs.org/dist/v14.4.0/node-v14.4.0-darwin-x64.tar.gz | tar -xz
-    PATH="$PWD/node-v14.4.0-darwin-x64/bin:$PATH"
+    NODE_VERSION=v12.18.3
+    curl -L "https://nodejs.org/dist/$NODE_VERSION/node-$NODE_VERSION-darwin-x64.tar.gz" | tar -xz
+    PATH="$PWD/node-$NODE_VERSION-darwin-x64/bin:$PATH"
   fi
 
   # https://github.com/actions/upload-artifact/issues/38

doc/CONTRIBUTING.md

@@ -2,6 +2,7 @@
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 # Contributing
 
+- [Pull Requests](#pull-requests)
 - [Requirements](#requirements)
 - [Development Workflow](#development-workflow)
 - [Build](#build)
@@ -12,6 +13,16 @@
 
 - [Detailed CI and build process docs](../ci)
 
+## Pull Requests
+
+Please link to the issue each PR solves.
+If there is no existing issue, please first create one unless the fix is minor.
+
+Please make sure the base of your PR is the master branch. We keep the GitHub
+default branch the latest release branch to avoid confusion as the
+documentation is on GitHub and we don't want users to see docs on unreleased
+features.
+
 ## Requirements
 
 Please refer to [VS Code's prerequisites](https://github.com/Microsoft/vscode/wiki/How-to-Contribute#prerequisites).
@@ -49,26 +60,45 @@ reset VS Code then run `yarn vscode:patch`.
 
 ## Build
 
+You can build with:
+
+```shell
+./ci/steps/release.sh
+```
+
+Run your build with:
+
+```
+cd release
+yarn --production
+# Runs the built JavaScript with Node.
+node .
+```
+
+Build release packages (make sure you run `./ci/steps/release.sh` first):
+
+```
+./ci/steps/release-packages.sh
+# The standalone release is in ./release-standalone
+# .deb, .rpm and the standalone archive are in ./release-packages
+```
+
+The `release.sh` script is the equivalent of:
+
 ```shell
 yarn
 yarn vscode
 yarn build
 yarn build:vscode
 yarn release
-cd release
-yarn --production
-# Runs the built JavaScript with Node.
-node .
 ```
 
-Now you can build release packages with:
+And `release-packages.sh` is:
 
 ```
 yarn release:standalone
-# The standalone release is in ./release-standalone
 yarn test:standalone-release
 yarn package
-# .deb, .rpm and the standalone archive are in ./release-packages
 ```
 
 ## Structure

doc/install.md

@@ -174,7 +174,13 @@ code-server
 # It will also mount your current directory into the container as `/home/coder/project`
 # and forward your UID/GID so that all file system operations occur as your user outside
 # the container.
+#
+# Your $HOME/.config is mounted at $HOME/.config within the container to ensure you can
+# easily access/modify your code-server config in $HOME/.config/code-server/config.json
+# outside the container.
+mkdir -p ~/.config
 docker run -it -p 127.0.0.1:8080:8080 \
+  -v "$HOME/.config:/home/coder/.config" \
   -v "$PWD:/home/coder/project" \
   -u "$(id -u):$(id -g)" \
   codercom/code-server:latest

doc/npm.md

@@ -21,7 +21,9 @@ sudo apt-get install -y \
   pkg-config \
   libx11-dev \
   libxkbfile-dev \
-  libsecret-1-dev
+  libsecret-1-dev \
+  python3
+npm config set python python3
 ```
 
 ## Fedora, CentOS, RHEL