Merge branch 'ensure-release' into restructure

.dockerignore

@@ -0,0 +1,2 @@
+**
+!release

.editorconfig

@@ -1,6 +0,0 @@
-root = true
-
-[*]
-indent_style = space
-trim_trailing_whitespace = true
-indent_size = 2

.travis.yml

@@ -3,6 +3,7 @@ language: minimal
 jobs:
   include:
     - name: Test
+      if: tag IS blank
       script: ./ci/image/run.sh "yarn && yarn vscode && ./ci/ci.sh"
       deploy: null
     - name: Linux Release

README.md

@@ -44,9 +44,6 @@ Use [sshcode](https://github.com/codercom/sshcode) for a simple setup.
 2. Unpack the downloaded file then run the binary.
 3. In your browser navigate to `localhost:8080`.
 
-- For self-hosting and other information see [doc/quickstart.md](doc/quickstart.md).
-- For hosting on cloud platforms see [doc/deploy.md](doc/deploy.md).
-
 ## FAQ
 
 See [./doc/FAQ.md](./doc/FAQ.md).

ci/release-image/Dockerfile

@@ -33,4 +33,4 @@ RUN rm -rf /var/lib/apt/lists/*
 EXPOSE 8080
 USER coder
 WORKDIR /home/coder
-ENTRYPOINT ["dumb-init", "fixuid", "-q", "code-server", "--host=0.0.0.0", "--auth=none"]
+ENTRYPOINT ["dumb-init", "fixuid", "-q", "code-server", "--host", "0.0.0.0", "."]

ci/release-image/push.sh

@@ -4,7 +4,7 @@ set -euo pipefail
 
 main() {
   cd "$(dirname "$0")/../.."
-  soruce ./ci/lib.sh
+  source ./ci/lib.sh
   set_version
 
   if [[ ${CI:-} ]]; then
@@ -12,12 +12,10 @@ main() {
   fi
 
   imageTag="codercom/code-server:$VERSION"
-  latest="codercom/code-server:latest"
+  if [[ ${TRAVIS_CPU_ARCH:-} == "arm64" ]]; then
-  if [[ $TRAVIS_CPU_ARCH == "arm64" ]]; then
     imageTag+="-arm64"
-    latest="codercom/code-server:arm64"
   fi
-  docker build -t "$imageTag" -t "$latest" -f ./ci/release-image/Dockerfile
+  docker build -t "$imageTag" -f ./ci/release-image/Dockerfile .
   docker push codercom/code-server
 }
 

ci/release.sh

@@ -35,7 +35,7 @@ function main() {
     for binary in code-server*; do
       mkdir -p "../binary-upload"
 
-      local prefix="code-server-$code_server_version-"
+      local prefix="code-server-$VERSION-"
       local target="${binary#$prefix}"
       if [[ $target == "linux-x86_64" ]]; then
         echo "Copying $binary to ../binary-upload/latest-linux"
@@ -43,7 +43,7 @@ function main() {
       fi
 
       local gcp_dir
-      gcp_dir="../binary-upload/releases/$code_server_version/$target"
+      gcp_dir="../binary-upload/releases/$VERSION/$target"
       mkdir -p "$gcp_dir"
 
       echo "Copying $binary to $gcp_dir/code-server"

doc/FAQ.md

@@ -1,8 +1,30 @@
 # FAQ
 
+## Questions?
+
+Please file all questions and support requests at https://www.reddit.com/r/codeserver/
+The issue tracker is only for bugs.
+
 ## What's the deal with extensions?
 
-Unfortunately, the Microsoft VS Code Marketplace is
+Unfortunately, the Microsoft VS Code Marketplace license prohibits use with any non Microsoft
+product.
+
+See https://cdn.vsassets.io/v/M146_20190123.39/_content/Microsoft-Visual-Studio-Marketplace-Terms-of-Use.pdf
+
+> Marketplace Offerings are intended for use only with Visual Studio Products and Services
+> and you may only install and use Marketplace Offerings with Visual Studio Products and Services.
+
+As a result, Coder has created its own marketplace for open source extensions. It works by scraping
+GitHub for VS Code extensions and building them. It's not perfect but getting better by the day with
+more and more extensions.
+
+Issue [https://github.com/cdr/code-server/issues/1299](#1299) is a big one in making the experience here
+better by allowing the community to submit extensions and repos to avoid waiting until the scraper finds
+an extension.
+
+If an extension does not work, try to grab its VSIX from its Github releases or build it yourself and
+copy it to the extensions folder.
 
 ## How is this different from VS Code Online?
 
@@ -34,16 +56,45 @@ only to HTTP requests.
 You can use [Let's Encrypt](https://letsencrypt.org/) to get an SSL certificate
 for free.
 
-## Why are there x86 releases?
+## x86 releases?
 
-32 bit releases have been
+node has dropped support for x86 and so we decided to as well. See
+[nodejs/build/issues/885](https://github.com/nodejs/build/issues/885).
+
+## Alpine builds?
+
+Just install `libc-dev` and code-server should work.
 
 ## Multi Tenancy
 
-If you want to run multiple code-server's on shared infrastructure, we recommend using
+If you want to run multiple code-server's on shared infrastructure, we recommend using virtual
-something like kubernetes and the code-server docker image.
+machines with a VM per user. This will easily allow users to run a docker daemon. If you want
+to use kubernetes, you'll definitely want to use [kubevirt](https://kubevirt.io) to give each
+user a virtual machine instead of just a container. Docker in docker while supported requires
+privileged containers which are a security risk in a multi tenant infrastructure.
+
+## Docker in code-server docker container?
+
+If you'd like to access docker inside of code-server, we'd recommend running a docker:dind container
+and mounting in a /var/run directory to share between that and the code-server container. Install
+the docker CLI in the code-server container and you should be able to access the daemon.
+
+In order to make volume mounts work, mount the home directory in the code-server container and the
+dind container at the same path. i.e you'd volume mount a directory from the host to `/home/coder`
+on both. This will allow any volume mounts in the home directory to work. Similar process
+to make volume mounts in any other directory work.
+
+## Collaboration
+
+At the moment we have no plans for multi user collaboration on code-server but we understand this
+is a heavily requested feature and will work on it when the time is right.
 
 ## How can I disable telemetry?
 
 Use the `--disable-telemetry` flag to completely disable telemetry. We use the
 data collected only to improve code-server.
+
+## Enterprise
+
+Visit [our enterprise page](https://coder.com) for more information about our
+enterprise offerings.

doc/assets/droplet.svg

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="200px" height="40px" viewBox="0 0 200 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 52.5 (67469) - http://www.bohemiancoding.com/sketch -->
+    <title>do-btn-blue-ghost</title>
+    <desc>Created with Sketch.</desc>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Partner-welcome-kit-Copy-3" transform="translate(-651.000000, -828.000000)">
+            <g id="do-btn-blue-ghost" transform="translate(651.000000, 828.000000)">
+                <rect id="Rectangle-Copy-4" stroke="#0069FF" x="0.5" y="0.5" width="199" height="39" rx="6"></rect>
+                <path d="M6,0 L47,0 L47,40 L6,40 C2.6862915,40 4.05812251e-16,37.3137085 0,34 L-8.8817842e-16,6 C-1.29399067e-15,2.6862915 2.6862915,6.08718376e-16 6,0 Z" id="Rectangle-Copy-5" fill="#0069FF"></path>
+                <g id="DO_Logo_horizontal_blue-Copy-3" transform="translate(13.000000, 10.000000)" fill="#FFFFFF">
+                    <path d="M10.0098493,20 L10.0098493,16.1262429 C14.12457,16.1262429 17.2897398,12.0548452 15.7269372,7.74627862 C15.1334679,6.14538921 13.8674,4.86072487 12.2650328,4.28756693 C7.952489,2.72620566 3.87733294,5.88845634 3.87733294,9.99938223 C3.87733294,9.99938223 3.87733294,9.99938223 3.87733294,9.99938223 L0,9.99938223 C0,3.45747613 6.3303395,-1.64165309 13.1948014,0.492866119 C16.2017127,1.42177726 18.57559,3.81322933 19.5053586,6.79760341 C21.6418482,13.6754986 16.5577943,20 10.0098493,20 Z" id="XMLID_49_"></path>
+                    <polygon id="XMLID_47_" points="9.52380952 16.1904762 5.71428571 16.1904762 5.71428571 12.3809524 5.71428571 12.3809524 9.52380952 12.3809524 9.52380952 12.3809524"></polygon>
+                    <polygon id="XMLID_46_" points="6.66666667 19.047619 3.80952381 19.047619 3.80952381 19.047619 3.80952381 16.1904762 6.66666667 16.1904762"></polygon>
+                    <polygon id="XMLID_45_" points="3.80952381 16.1904762 0.952380952 16.1904762 0.952380952 16.1904762 0.952380952 13.3333333 0.952380952 13.3333333 3.80952381 13.3333333 3.80952381 13.3333333"></polygon>
+                </g>
+                <!-- Modified to add GitHub font-family after DigitalOcean's font-family, otherwise it looks bad on GitHub -->
+                <text id="Create-a-Droplet-Copy-3" font-family="Sailec-Medium, Sailec, -apple-system, BlinkMacSystemFont, Segoe UI, Helvetica, Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol" font-size="16" font-weight="400" fill="#0069FF">
+                    <tspan x="58" y="26">Create a Droplet</tspan>
+                </text>
+            </g>
+        </g>
+    </g>
+</svg>