Add CI

Author: ammario

.travis.yml

@@ -0,0 +1,28 @@
+language: go
+
+dist: xenial
+services:
+  - docker
+
+go:
+- 1.12
+
+go_import_path: go.coder.com/sail
+
+install: true
+env:
+  - GO111MODULE=on
+script:
+  - env
+  - ci/build.sh
+  - cat /etc/passwd
+  - sudo usermod -u 1000 travis
+  - sudo groupmod -g 1000 travis
+  - go test -v ./...
+
+deploy:
+  provider: releases
+  api_key: "GITHUB OAUTH TOKEN"
+  file: "bin/sail-linux-amd64"
+  skip_cleanup: true
+  draft: true

ci/build.sh

@@ -18,4 +18,4 @@ build(){
 }
 
 GOOS=darwin build
-GOOS=linux build
+GOOS=linux build

images/base/Dockerfile

@@ -27,4 +27,23 @@ RUN wget -O /usr/bin/code-server https://codesrv-ci.cdr.sh/latest-linux && \
     chmod +x /usr/bin/code-server
 
 
-ADD installext /usr/bin/installext
+ADD installext /usr/bin/installext
+
+# Use fixuid so that we can dynamically change the uid:gid to match what is being used by the host user.
+# Note: If the project is large, the `chown -R` call from fixuid can take a long time.
+# TODO: optimize the chown for larger projects.
+RUN addgroup --gid 1000 user && \
+    adduser --uid 1000 --ingroup user --home /home/user --shell /bin/sh --disabled-password --gecos "" user && \
+    echo "user ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers.d/nopasswd
+
+RUN USER=user && \
+    GROUP=user && \
+    curl -SsL https://github.com/boxboat/fixuid/releases/download/v0.4/fixuid-0.4-linux-amd64.tar.gz | tar -C /usr/local/bin -xzf - && \
+    chown root:root /usr/local/bin/fixuid && \
+    chmod 4755 /usr/local/bin/fixuid && \
+    mkdir -p /etc/fixuid && \
+    printf "user: $USER\ngroup: $GROUP\n" > /etc/fixuid/config.yml
+
+USER user:user
+
+ENTRYPOINT ["fixuid"]

internal/codeserver/proc.go

@@ -34,7 +34,7 @@ func Port(containerName string) (string, error) {
 	// tcp        0      0 127.0.0.53:domain       0.0.0.0:*               LISTEN      -
 	out, err := dockutil.Exec(containerName, "netstat", "-tpl").CombinedOutput()
 	if err != nil {
-		return "", xerrors.Errorf("failed to netstat: %s, %w", out, err)
+		return "", xerrors.Errorf("failed to netstat %s: %w", out, err)
 	}
 
 	lines := strings.Split(string(out), "\n")

project_test.go

@@ -26,15 +26,15 @@ func Test_project(t *testing.T) {
 		expCustomBldImg bool
 	}{
 		{
-			"ssh",
+			"https",
 			"OK",
 			"codercom/bigdur",
 			"codercom_bigdur",
 			false,
 			true,
 		},
 		{
-			"ssh",
+			"https",
 			"RepoNotExist",
 			"codercom/do-not-exist",
 			"codercom_do-not-exist",

proxycmd.go

@@ -12,12 +12,13 @@ import (
 	"net/http"
 	"net/http/httputil"
 	"net/url"
-	"nhooyr.io/websocket"
 	"strconv"
 	"sync"
 	"sync/atomic"
 	"time"
 
+	"nhooyr.io/websocket"
+
 	"go.coder.com/cli"
 	"go.coder.com/flog"
 	"golang.org/x/xerrors"

repo_test.go

@@ -7,7 +7,7 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestParseRepo(t *testing.T) {
+func Test_parseRepo(t *testing.T) {
 	var tests = []struct {
 		defSchema string
 		defHost   string
@@ -85,17 +85,6 @@ func TestParseRepo(t *testing.T) {
 			"ssh",
 			"ssh://[email protected]/cdr/sail.git",
 		},
-		// ensure custom host works
-		{
-			"https",
-			"my.private-git.com",
-			"private/repo",
-			"private/repo",
-			"my.private-git.com",
-			"",
-			"https",
-			"https://my.private-git.com/private/repo.git",
-		},
 	}
 
 	for _, test := range tests {

sail_helpers_test.go

@@ -129,6 +129,10 @@ func requireProjectsNotRunning(t *testing.T, projects ...string) {
 	}
 }
 
+func requireUbuntuDevImage(t *testing.T) {
+	require.NoError(t, ensureImage("codercom/ubuntu-dev"))
+}
+
 func requireGetImageLabels(t *testing.T, image string) map[string]string {
 	return requireImageInspect(t, image).ContainerConfig.Labels
 }
@@ -185,10 +189,6 @@ func requireContainerRemove(t *testing.T, cntName string) {
 	require.NoError(t, err)
 }
 
-func requireUbuntuDevImage(t *testing.T) {
-	require.NoError(t, ensureImage("codercom/ubuntu-dev"))
-}
-
 type rollback struct {
 	fns []func()
 }