Merge branch 'master' into specify-folder

Author: coadler

.sail/Dockerfile

@@ -8,9 +8,6 @@ RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.34.0/install.sh | b
 
 LABEL project_root "~/go/src/go.coder.com"
 
-# Modules break much of Go's tooling.
-ENV GO111MODULE=off
-
 # Install the latest version of Hugo.
 RUN wget -O /tmp/hugo.deb https://github.com/gohugoio/hugo/releases/download/v0.55.4/hugo_extended_0.55.4_Linux-64bit.deb && \
   sudo dpkg -i /tmp/hugo.deb && \

README.md

@@ -2,6 +2,7 @@
 
 [!["Open Issues"](https://img.shields.io/github/issues-raw/cdr/sail.svg)](https://github.com/cdr/sail/issues)
 [![MIT license](https://img.shields.io/badge/license-MIT-green.svg)](https://github.com/cdr/sail/blob/master/LICENSE)
+[![AUR version](https://img.shields.io/aur/version/sail.svg)](https://aur.archlinux.org/packages/sail/)
 [![Discord](https://img.shields.io/discord/463752820026376202.svg?label=&logo=discord&logoColor=ffffff&color=7389D8&labelColor=6A7EC2)](https://discord.gg/zxSwN8Z)
 
 `sail` is a universal workflow for reproducible, project-defined development environments.
@@ -57,6 +58,8 @@ in your [$PATH](https://superuser.com/questions/284342/what-are-path-and-other-e
 curl https://sail.dev/install.sh | bash
 ```
 
+For Arch users, there is an official [AUR package](https://aur.archlinux.org/packages/sail).
+
 ### Verify the Installation
 
 To verify Sail is properly installed, run `sail --help` on your system. If everything is installed correctly, you should see Sail's help text.
@@ -73,3 +76,4 @@ To open GitHub or GitLab projects in a Sail environment with a single click, see
 ### Learn More
 
 Additional docs covering concepts and configuration can be found at [https://sail.dev/docs](https://sail.dev/docs/introduction/).
+

autocomplete.go

@@ -6,6 +6,7 @@ import (
 	"unicode/utf8"
 
 	"github.com/posener/complete"
+
 	"go.coder.com/cli"
 )
 

chrome.go

@@ -15,11 +15,12 @@ import (
 	"time"
 	"unsafe"
 
-	"go.coder.com/cli"
-	"go.coder.com/flog"
 	"golang.org/x/xerrors"
 	"nhooyr.io/websocket"
 	"nhooyr.io/websocket/wsjson"
+
+	"go.coder.com/cli"
+	"go.coder.com/flog"
 )
 
 func runNativeMsgHost() {
@@ -108,6 +109,10 @@ func (c *chromeExtInstall) Run(fl *flag.FlagSet) {
 	}
 
 	for _, dir := range nativeHostDirs {
+		if dir == "" {
+			continue
+		}
+
 		err = os.MkdirAll(dir, 0755)
 		if err != nil {
 			flog.Fatal("failed to ensure manifest directory exists: %v", err)
@@ -146,14 +151,20 @@ func nativeMessageHostManifestDirectories() ([]string, error) {
 	}
 
 	var chromeDir string
+	var chromeBetaDir string
+	var chromeDevDir string
+	var chromeCanaryDir string
 	var chromiumDir string
 
 	switch runtime.GOOS {
 	case "linux":
 		chromeDir = path.Join(homeDir, ".config", "google-chrome", "NativeMessagingHosts")
+		chromeBetaDir = path.Join(homeDir, ".config", "google-chrome-beta", "NativeMessagingHosts")
+		chromeDevDir = path.Join(homeDir, ".config", "google-chrome-unstable", "NativeMessagingHosts")
 		chromiumDir = path.Join(homeDir, ".config", "chromium", "NativeMessagingHosts")
 	case "darwin":
 		chromeDir = path.Join(homeDir, "Library", "Application Support", "Google", "Chrome", "NativeMessagingHosts")
+		chromeCanaryDir = path.Join(homeDir, "Library", "Application Support", "Google", "Chrome Canary", "NativeMessagingHosts")
 		chromiumDir = path.Join(homeDir, "Library", "Application Support", "Chromium", "NativeMessagingHosts")
 	default:
 		return nil, xerrors.Errorf("unsupported os %q", runtime.GOOS)
@@ -162,5 +173,8 @@ func nativeMessageHostManifestDirectories() ([]string, error) {
 	return []string{
 		chromeDir,
 		chromiumDir,
+		chromeBetaDir,
+		chromeDevDir,
+		chromeCanaryDir,
 	}, nil
 }

ci/build.sh

@@ -10,12 +10,12 @@ build(){
 	go build -ldflags "-X main.version=${tag}" -o $tmpdir/sail
 
 	pushd $tmpdir
-	tarname=sail-$GOOS-$GOARCH.tar
-	tar -cf $tarname sail
+	tarname=sail-$GOOS-$GOARCH.tar.gz
+	tar -czf $tarname sail
 	popd	
 	cp $tmpdir/$tarname bin
 	rm -rf $tmpdir
 }
 
 GOOS=darwin build
-GOOS=linux build
+GOOS=linux build

codeserver.go

@@ -14,17 +14,31 @@ import (
 	"strings"
 	"time"
 
+	"golang.org/x/xerrors"
+
 	"go.coder.com/flog"
 	"go.coder.com/sail/internal/codeserver"
-	"golang.org/x/xerrors"
 )
 
 // loadCodeServer produces a path containing the code-server binary.
 // It will attempt to cache the binary.
 func loadCodeServer(ctx context.Context) (string, error) {
 	start := time.Now()
 
-	const cachePath = "/tmp/sail-code-server-cache/code-server"
+	var cachePath string
+	const codeServerPathSuffix = "sail-code-server-cache/code-server"
+	// MacOS maps os.TempDir() to `/var/folders/...`, which isn't shared with the docker
+	// system since docker tries to comply with Apple's filesystem sandbox guidelines, so
+	// default to `/tmp` when on MacOS.
+	//
+	// See:
+	// https://stackoverflow.com/questions/45122459/docker-mounts-denied-the-paths-are-not-shared-from-os-x-and-are-not-known
+	switch runtime.GOOS {
+	case "darwin":
+		cachePath = filepath.Join("/tmp", codeServerPathSuffix)
+	default:
+		cachePath = filepath.Join(os.TempDir(), codeServerPathSuffix)
+	}
 
 	// downloadURLPath stores the download URL, so we know whether we should update
 	// the binary.

config.go

@@ -7,6 +7,7 @@ import (
 	"strings"
 
 	"github.com/BurntSushi/toml"
+
 	"go.coder.com/flog"
 )
 
@@ -18,27 +19,28 @@ func resolvePath(homedir string, path string) string {
 		return path
 	}
 
-	list := strings.Split(path, string(filepath.Separator))
-
-	for i, seg := range list {
-		if seg == "~" {
-			list[i] = homedir
-		}
+	// Replace tilde notation in path with homedir.
+	if path == "~" {
+		path = homedir
+	} else if strings.HasPrefix(path, "~/") {
+		path = filepath.Join(homedir, path[2:])
 	}
 
-	return filepath.Join(list...)
+	return filepath.Clean(path)
 }
 
 // config describes the config.toml.
 // Changes to this should be accompanied by changes to DefaultConfig.
 type config struct {
-	DefaultImage  string `toml:"default_image"`
-	ProjectRoot   string `toml:"project_root"`
-	DefaultHat    string `toml:"default_hat"`
-	DefaultSchema string `toml:"default_schema"`
-	DefaultHost   string `toml:"default_host"`
+	DefaultImage        string `toml:"default_image"`
+	ProjectRoot         string `toml:"project_root"`
+	DefaultHat          string `toml:"default_hat"`
+	DefaultSchema       string `toml:"default_schema"`
+	DefaultHost         string `toml:"default_host"`
+	DefaultOrganization string `toml:"default_organization"`
 }
 
+// DefaultConfig is the default configuration file string.
 const DefaultConfig = `# sail configuration.
 # default_image is the default Docker image to use if the repository provides none.
 default_image = "codercom/ubuntu-dev"
@@ -55,6 +57,10 @@ default_schema = "ssh"
 
 # default host used to clone repo in sail run if none given
 default_host = "github.com"
+
+# default_oranization lets you configure which username to use on default_host
+# when cloning a repo.
+# default_organization = ""
 `
 
 // metaRoot returns the root path of all metadata stored on the host.

editcmd.go

@@ -9,14 +9,14 @@ import (
 	"time"
 
 	"github.com/docker/docker/api/types"
+	"golang.org/x/xerrors"
 
 	"go.coder.com/cli"
 	"go.coder.com/flog"
 	"go.coder.com/sail/internal/dockutil"
 	"go.coder.com/sail/internal/editor"
 	"go.coder.com/sail/internal/randstr"
 	"go.coder.com/sail/internal/xexec"
-	"golang.org/x/xerrors"
 )
 
 type editcmd struct {

extension/logo128.png

@@ -2,7 +2,7 @@
 	"manifest_version": 2,
 
 	"name": "Sail",
-	"version": "1.0.5",
+	"version": "1.0.9",
 	"author": "Coder",
 	"description": "Work in immutable, pre-configured development environments.",
 
@@ -15,7 +15,8 @@
 	"content_scripts": [
 		{
 			"matches": [
-				"https://*/*"
+				"https://github.com/*",
+				"https://gitlab.com/*"
 			],
 			"js": [
 				"out/content.js"
@@ -25,8 +26,11 @@
 	"permissions": [
 		"nativeMessaging"
 	],
+	"icons": {
+		"128": "logo128.png"
+	},
 	"browser_action": {
 		"default_title": "Sail",
 		"default_popup": "out/popup.html"
 	}
-}
+}

extension/manifest.json

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-zip -R extension manifest.json out/*
+zip -R extension manifest.json out/* logo128.png

extension/pack.sh

@@ -23,7 +23,7 @@ const doConnection = (socketUrl: string, projectUrl: string, onMessage: (data: {
 				return;
 			}
 			const type = data.type;
-			const content = atob(data.v);
+			const content = type === "data" ? atob(data.v) : data.v;
 
 			switch (type) {
 				case "data":
@@ -39,7 +39,7 @@ const doConnection = (socketUrl: string, projectUrl: string, onMessage: (data: {
 
 const ensureButton = (): void | HTMLElement => {
 	const buttonId = "openinsail";
-	const btn = document.querySelector(buttonId) as HTMLElement;
+	const btn = document.querySelector("#" + buttonId) as HTMLElement;
 	if (btn) {
 		return btn;
 	}
@@ -121,6 +121,14 @@ const ensureButton = (): void | HTMLElement => {
 					if (data.type === "data") {
 						text.innerText += data.v;
 						term.scrollTop = term.scrollHeight;
+					} else if (data.type === "error") {
+						text.innerText += data.v;
+						term.scrollTop = term.scrollHeight;
+						setTimeout(() => {
+							btn.innerText = "Open in Sail";
+							btn.classList.remove("disabled");
+							term.remove();
+						}, 5000);
 					}
 				});
 			}).then((socket) => {
@@ -141,10 +149,8 @@ const ensureButton = (): void | HTMLElement => {
 
 		requestSail().then(() => (button as HTMLElement).classList.remove("disabled"))
 			.catch((ex) => {
-				if (ex.toString().indexOf("host not found") !== -1) {
-					(button as HTMLElement).style.opacity = "0.5";
-					(button as HTMLElement).title = "Setup Sail using the extension icon in the top-right!";
-				}
+				(button as HTMLElement).style.opacity = "0.5";
+				(button as HTMLElement).title = "Setup Sail using the extension icon in the top-right!";
 			});
 	}
 

extension/src/content.ts

@@ -9,7 +9,7 @@ requestSail().then((url) => {
 }).catch((ex) => {
 	const has = (str: string) => ex.toString().indexOf(str) !== -1;
 
-	if (has("not found")) {
+	if (has("not found") || has("forbidden")) {
 		document.body.innerText = "After installing sail, run `sail install-for-chrome-ext`.";
 	} else {
 		document.body.innerText = ex.toString();

extension/src/popup.ts

@@ -67,6 +67,7 @@ func requireRepo(conf config, prefs schemaPrefs, fl *flag.FlagSet) repo {
 		// there's not currently way for us to figure out the host anyways
 		r = repo{URL: &url.URL{Path: repoName}}
 	} else {
+	r, err = parseRepo(defaultSchema(conf, prefs), conf.DefaultHost, conf.DefaultOrganization, repoURI)
 		r, err = parseRepo(defaultSchema(conf, prefs), conf.DefaultHost, repoURI)
 		if err != nil {
 			flog.Fatal("failed to parse repo %q: %v", repoURI, err)

globalflags.go

@@ -10,10 +10,11 @@ import (
 	"strings"
 
 	"github.com/docker/docker/client"
+	"golang.org/x/xerrors"
+
 	"go.coder.com/flog"
 	"go.coder.com/sail/internal/hat"
 	"go.coder.com/sail/internal/xexec"
-	"golang.org/x/xerrors"
 )
 
 // hatBuilder is responsible for applying a hat to a base image.
@@ -71,7 +72,10 @@ func (b *hatBuilder) applyHat() (string, error) {
 		return "", xerrors.Errorf("failed to resolve hat path: %w", err)
 	}
 
-	dockerFilePath := filepath.Join(hatPath, "Dockerfile")
+	dockerFilePath := hatPath
+	if base := filepath.Base(hatPath); strings.ToLower(base) != "dockerfile" {
+		dockerFilePath = filepath.Join(hatPath, "Dockerfile")
+	}
 
 	dockerFileByt, err := ioutil.ReadFile(dockerFilePath)
 	if err != nil {

hat_builder.go

@@ -58,4 +58,7 @@ extensions or tooling.
 
 `buildpush.sh` - This script takes an image name, i.e. `ubuntu-dev-go1.12`, changes into the specified directory,
 and calls `buildlang.sh` and `push.sh` to build the language image and push the finalized image to the codercom
-docker hub.
+docker hub.
+
+`buildbase.sh` - This script builds both of the base images and is run via `main.sh` or should be run before
+doing a `buildpush.sh` for a specific language.

images/README.md

@@ -0,0 +1,14 @@
+#!/bin/bash
+set -eu
+
+BASE_IMAGE=ubuntu-dev
+
+# Build the base for all images.
+pushd base
+    docker build -t sail-base --label com.coder.sail.base_image=sail-base .
+popd
+
+# Build our base ubuntu-dev image for non language specific environments.
+pushd $BASE_IMAGE
+    ./buildpush.sh
+popd