Merge branch 'main' into bpmct/add-docker-builds

bpmct · bpmct · commit 36679ecde54d · 2022-05-17T16:31:22.000Z
diff --git a/cli/cliflag/cliflag.go b/cli/cliflag/cliflag.go
@@ -40,7 +40,11 @@ func StringVarP(flagset *pflag.FlagSet, p *string, name string, shorthand string
 func StringArrayVarP(flagset *pflag.FlagSet, ptr *[]string, name string, shorthand string, env string, def []string, usage string) {
 	val, ok := os.LookupEnv(env)
 	if ok {
-		def = strings.Split(val, ",")
+		if val == "" {
+			def = []string{}
+		} else {
+			def = strings.Split(val, ",")
+		}
 	}
 	flagset.StringArrayVarP(ptr, name, shorthand, def, usage)
 }
diff --git a/cli/cliflag/cliflag_test.go b/cli/cliflag/cliflag_test.go
@@ -96,6 +96,16 @@ func TestCliflag(t *testing.T) {
 		require.Equal(t, []string{"wow", "test"}, got)
 	})
 
+	t.Run("StringArrayEnvVarEmpty", func(t *testing.T) {
+		var ptr []string
+		flagset, name, shorthand, env, usage := randomFlag()
+		t.Setenv(env, "")
+		cliflag.StringArrayVarP(flagset, &ptr, name, shorthand, env, nil, usage)
+		got, err := flagset.GetStringArray(name)
+		require.NoError(t, err)
+		require.Equal(t, []string{}, got)
+	})
+
 	t.Run("IntDefault", func(t *testing.T) {
 		var ptr uint8
 		flagset, name, shorthand, env, usage := randomFlag()
diff --git a/cli/ssh.go b/cli/ssh.go
@@ -27,7 +27,7 @@ import (
 )
 
 var autostopPollInterval = 30 * time.Second
-var autostopNotifyCountdown = []time.Duration{5 * time.Minute}
+var autostopNotifyCountdown = []time.Duration{30 * time.Minute}
 
 func ssh() *cobra.Command {
 	var (
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -5,8 +5,10 @@ services:
     ports:
       - "7080:7080"
     environment:
-      CODER_PG_CONNECTION_URL: "postgresql://username:password@database/coder?sslmode=disable"
+      CODER_PG_CONNECTION_URL: "postgresql://${POSTGRES_USER:-username}:${POSTGRES_PASSWORD:-password}@database/${POSTGRES_DB:-coder}?sslmode=disable"
       CODER_ADDRESS: "0.0.0.0:7080"
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
     depends_on:
       database:
         condition: service_healthy
diff --git a/examples/docker-image-builds/main.tf b/examples/docker-image-builds/main.tf
@@ -41,6 +41,10 @@ provider "docker" {
   host = "unix:///var/run/docker.sock"
 }
 
+provider "coder" {
+  url = "http://host.docker.internal:7080"
+}
+
 data "coder_workspace" "me" {
 }
 
@@ -93,6 +97,10 @@ resource "docker_container" "workspace" {
   dns      = ["1.1.1.1"]
   command  = ["sh", "-c", coder_agent.dev.init_script]
   env      = ["CODER_AGENT_TOKEN=${coder_agent.dev.token}"]
+  host {
+    host = "host.docker.internal"
+    ip   = "host-gateway"
+  }
   volumes {
     container_path = "/home/coder/"
     volume_name    = docker_volume.home_volume.name
diff --git a/examples/docker/main.tf b/examples/docker/main.tf
@@ -48,6 +48,10 @@ provider "docker" {
   host = "unix:///var/run/docker.sock"
 }
 
+provider "coder" {
+  url = "http://host.docker.internal:7080"
+}
+
 data "coder_workspace" "me" {
 }
 
@@ -86,6 +90,10 @@ resource "docker_container" "workspace" {
   dns      = ["1.1.1.1"]
   command  = ["sh", "-c", coder_agent.dev.init_script]
   env      = ["CODER_AGENT_TOKEN=${coder_agent.dev.token}"]
+  host {
+    host = "host.docker.internal"
+    ip   = "host-gateway"
+  }
   volumes {
     container_path = "/home/coder/"
     volume_name    = docker_volume.home_volume.name
diff --git a/site/package-lock.json b/site/package-lock.json
diff --git a/site/package.json b/site/package.json
diff --git a/site/yarn.lock b/site/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,11 @@ func StringVarP(flagset pflag.FlagSet, p string, name string, shorthand string`
`40`	`40`	`func StringArrayVarP(flagset pflag.FlagSet, ptr []string, name string, shorthand string, env string, def []string, usage string) {`
`41`	`41`	`val, ok := os.LookupEnv(env)`
`42`	`42`	`if ok {`
`43`		`- def = strings.Split(val, ",")`
	`43`	`+ if val == "" {`
	`44`	`+ def = []string{}`
	`45`	`+ } else {`
	`46`	`+ def = strings.Split(val, ",")`
	`47`	`+ }`
`44`	`48`	`}`
`45`	`49`	`flagset.StringArrayVarP(ptr, name, shorthand, def, usage)`
`46`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ import (`
`27`	`27`	`)`
`28`	`28`
`29`	`29`	`var autostopPollInterval = 30 * time.Second`
`30`		`-var autostopNotifyCountdown = []time.Duration{5 * time.Minute}`
	`30`	`+var autostopNotifyCountdown = []time.Duration{30 * time.Minute}`
`31`	`31`
`32`	`32`	`func ssh() *cobra.Command {`
`33`	`33`	`var (`