Merge branch 'main' into 3321-template-space-b

mtojek · mtojek · commit d32247dfec79 · 2022-11-10T12:32:14.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -49,3 +49,6 @@ site/out/
 **/*.swp
 .coderv2/*
 **/__debug_bin
+
+# direnv
+.envrc
diff --git a/coderd/database/gen/dump/main.go b/coderd/database/gen/dump/main.go
@@ -8,11 +8,15 @@ import (
 	"os/exec"
 	"path/filepath"
 	"runtime"
+	"strconv"
+	"strings"
 
 	"github.com/coder/coder/coderd/database/migrations"
 	"github.com/coder/coder/coderd/database/postgres"
 )
 
+const minimumPostgreSQLVersion = 13
+
 func main() {
 	connection, closeFn, err := postgres.Open()
 	if err != nil {
@@ -30,12 +34,23 @@ func main() {
 		panic(err)
 	}
 
-	cmd := exec.Command(
-		"docker",
-		"run",
-		"--rm",
-		"--network=host",
-		"postgres:13",
+	hasPGDump := false
+	if _, err = exec.LookPath("pg_dump"); err == nil {
+		out, err := exec.Command("pg_dump", "--version").Output()
+		if err == nil {
+			// Parse output:
+			// pg_dump (PostgreSQL) 14.5 (Ubuntu 14.5-0ubuntu0.22.04.1)
+			parts := strings.Split(string(out), " ")
+			if len(parts) > 2 {
+				version, err := strconv.Atoi(strings.Split(parts[2], ".")[0])
+				if err == nil && version >= minimumPostgreSQLVersion {
+					hasPGDump = true
+				}
+			}
+		}
+	}
+
+	cmdArgs := []string{
 		"pg_dump",
 		"--schema-only",
 		connection,
@@ -45,8 +60,18 @@ func main() {
 		// We never want to manually generate
 		// queries executing against this table.
 		"--exclude-table=schema_migrations",
-	)
+	}
 
+	if !hasPGDump {
+		cmdArgs = append([]string{
+			"docker",
+			"run",
+			"--rm",
+			"--network=host",
+			fmt.Sprintf("postgres:%d", minimumPostgreSQLVersion),
+		}, cmdArgs...)
+	}
+	cmd := exec.Command(cmdArgs[0], cmdArgs[1:]...) //#nosec
 	cmd.Env = append(os.Environ(), []string{
 		"PGTZ=UTC",
 		"PGCLIENTENCODING=UTF8",
diff --git a/coderd/database/generate.sh b/coderd/database/generate.sh
@@ -13,8 +13,10 @@ SCRIPT_DIR=$(dirname "${BASH_SOURCE[0]}")
 (
 	cd "$SCRIPT_DIR"
 
-	# Dump the updated schema.
-	go run gen/dump/main.go
+	echo generate 1>&2
+
+	# Dump the updated schema (use make to utilize caching).
+	make -C ../.. --no-print-directory coderd/database/dump.sql
 	# The logic below depends on the exact version being correct :(
 	go run github.com/kyleconroy/sqlc/cmd/sqlc@v1.13.0 generate
 
diff --git a/examples/templates/docker/build/Dockerfile b/examples/templates/docker/build/Dockerfile
@@ -1,3 +1,18 @@
 FROM ubuntu
 
-RUN apt-get update && apt-get install -y curl wget git vim golang
+RUN apt-get update \
+	&& apt-get install -y \
+	curl \
+	git \
+	golang \
+	sudo \
+	vim \
+	wget \
+	&& rm -rf /var/lib/apt/lists/*
+
+ARG USER=coder
+RUN useradd --groups sudo --no-create-home ${USER} \
+	&& echo "${USER} ALL=(ALL) NOPASSWD:ALL" >/etc/sudoers.d/${USER} \
+	&& chmod 0440 /etc/sudoers.d/${USER}
+USER ${USER}
+WORKDIR /home/${USER}
diff --git a/examples/templates/docker/main.tf b/examples/templates/docker/main.tf
@@ -11,6 +11,10 @@ terraform {
   }
 }
 
+locals {
+  username = data.coder_workspace.me.owner
+}
+
 data "coder_provisioner" "me" {
 }
 
@@ -46,7 +50,7 @@ resource "coder_app" "code-server" {
   agent_id     = coder_agent.main.id
   slug         = "code-server"
   display_name = "code-server"
-  url          = "http://localhost:13337/?folder=/home/coder"
+  url          = "http://localhost:13337/?folder=/home/${local.username}"
   icon         = "/icon/code.svg"
   subdomain    = false
   share        = "owner"
@@ -91,6 +95,9 @@ resource "docker_image" "main" {
   name = "coder-${data.coder_workspace.me.id}"
   build {
     path = "./build"
+    build_arg = {
+      USER = local.username
+    }
   }
   triggers = {
     dir_sha1 = sha1(join("", [for f in fileset(path.module, "build/*") : filesha1(f)]))
@@ -112,7 +119,7 @@ resource "docker_container" "workspace" {
     ip   = "host-gateway"
   }
   volumes {
-    container_path = "/home/coder/"
+    container_path = "/home/${local.username}"
     volume_name    = docker_volume.home_volume.name
     read_only      = false
   }

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,10 @@ terraform {`
`11`	`11`	`}`
`12`	`12`	`}`
`13`	`13`
	`14`	`+locals {`
	`15`	`+ username = data.coder_workspace.me.owner`
	`16`	`+}`
	`17`	`+`
`14`	`18`	`data "coder_provisioner" "me" {`
`15`	`19`	`}`
`16`	`20`
`@@ -46,7 +50,7 @@ resource "coder_app" "code-server" {`
`46`	`50`	`agent_id = coder_agent.main.id`
`47`	`51`	`slug = "code-server"`
`48`	`52`	`display_name = "code-server"`
`49`		`- url = "http://localhost:13337/?folder=/home/coder"`
	`53`	`+ url = "http://localhost:13337/?folder=/home/${local.username}"`
`50`	`54`	`icon = "/icon/code.svg"`
`51`	`55`	`subdomain = false`
`52`	`56`	`share = "owner"`
`@@ -91,6 +95,9 @@ resource "docker_image" "main" {`
`91`	`95`	`name = "coder-${data.coder_workspace.me.id}"`
`92`	`96`	`build {`
`93`	`97`	`path = "./build"`
	`98`	`+ build_arg = {`
	`99`	`+ USER = local.username`
	`100`	`+ }`
`94`	`101`	`}`
`95`	`102`	`triggers = {`
`96`	`103`	`dir_sha1 = sha1(join("", [for f in fileset(path.module, "build/*") : filesha1(f)]))`
`@@ -112,7 +119,7 @@ resource "docker_container" "workspace" {`
`112`	`119`	`ip = "host-gateway"`
`113`	`120`	`}`
`114`	`121`	`volumes {`
`115`		`- container_path = "/home/coder/"`
	`122`	`+ container_path = "/home/${local.username}"`
`116`	`123`	`volume_name = docker_volume.home_volume.name`
`117`	`124`	`read_only = false`
`118`	`125`	`}`