diff --git a/cli/server.go b/cli/server.go index 86016d9c9bd7a..fd8e41d2ebb37 100644 --- a/cli/server.go +++ b/cli/server.go @@ -1153,7 +1153,7 @@ func startBuiltinPostgres(ctx context.Context, cfg config.Root, logger slog.Logg stdlibLogger := slog.Stdlib(ctx, logger.Named("postgres"), slog.LevelDebug) ep := embeddedpostgres.NewDatabase( embeddedpostgres.DefaultConfig(). - Version(embeddedpostgres.V13). + Version(embeddedpostgres.V14). BinariesPath(filepath.Join(cfg.PostgresPath(), "bin")). DataPath(filepath.Join(cfg.PostgresPath(), "data")). RuntimePath(filepath.Join(cfg.PostgresPath(), "runtime")). diff --git a/examples/templates/docker-code-server/main.tf b/examples/templates/docker-code-server/main.tf index 29be1ff990219..33f6ee0485665 100644 --- a/examples/templates/docker-code-server/main.tf +++ b/examples/templates/docker-code-server/main.tf @@ -2,41 +2,26 @@ terraform { required_providers { coder = { source = "coder/coder" - version = "0.4.3" + version = "0.4.5" } docker = { source = "kreuzwerker/docker" - version = "~> 2.16.0" + version = "~> 2.20.2" } } } -variable "docker_host" { - description = "Specify location of Docker socket (check `docker context ls` if you're not sure)" - sensitive = true -} - -variable "docker_arch" { - description = "Specify architecture of docker host (amd64, arm64, or armv7)" - validation { - condition = contains(["amd64", "arm64", "armv7"], var.docker_arch) - error_message = "Value must be amd64, arm64, or armv7." - } - sensitive = true -} - -provider "coder" { +data "coder_provisioner" "me" { } provider "docker" { - host = var.docker_host } data "coder_workspace" "me" { } resource "coder_agent" "main" { - arch = var.docker_arch + arch = data.coder_provisioner.me.arch os = "linux" startup_script = "code-server --auth none" diff --git a/examples/templates/docker-image-builds/main.tf b/examples/templates/docker-image-builds/main.tf index c135a09c2112e..bdb8da5559d0b 100644 --- a/examples/templates/docker-image-builds/main.tf +++ b/examples/templates/docker-image-builds/main.tf @@ -3,65 +3,26 @@ terraform { required_providers { coder = { source = "coder/coder" - version = "0.4.3" + version = "0.4.5" } docker = { source = "kreuzwerker/docker" - version = "~> 2.16.0" + version = "~> 2.20.2" } } } -# Admin parameters -variable "step1_docker_host_warning" { - description = <<-EOF - Is Docker running on the Coder host? - - This template will use the Docker socket present on - the Coder host, which is not necessarily your local machine. - - You can specify a different host in the template file and - suppress this warning. - EOF - validation { - condition = contains(["Continue using /var/run/docker.sock on the Coder host"], var.step1_docker_host_warning) - error_message = "Cancelling template create." - } - - sensitive = true -} -variable "step2_arch" { - description = "arch: What architecture is your Docker host on?" - validation { - condition = contains(["amd64", "arm64", "armv7"], var.step2_arch) - error_message = "Value must be amd64, arm64, or armv7." - } - sensitive = true -} -variable "step3_OS" { - description = <<-EOF - What operating system is your Coder host on? - EOF - - validation { - condition = contains(["MacOS", "Windows", "Linux"], var.step3_OS) - error_message = "Value must be MacOS, Windows, or Linux." - } - sensitive = true +data "coder_provisioner" "me" { } provider "docker" { - host = var.step3_OS == "Windows" ? "npipe:////.//pipe//docker_engine" : "unix:///var/run/docker.sock" -} - -provider "coder" { } data "coder_workspace" "me" { } resource "coder_agent" "main" { - arch = var.step2_arch + arch = data.coder_provisioner.me.arch os = "linux" } diff --git a/examples/templates/docker-with-dotfiles/main.tf b/examples/templates/docker-with-dotfiles/main.tf index afc91c34e326b..9bee0ddf2142f 100644 --- a/examples/templates/docker-with-dotfiles/main.tf +++ b/examples/templates/docker-with-dotfiles/main.tf @@ -9,20 +9,19 @@ terraform { required_providers { coder = { source = "coder/coder" - version = "0.4.3" + version = "0.4.5" } docker = { source = "kreuzwerker/docker" - version = "~> 2.16.0" + version = "~> 2.20.2" } } } -provider "docker" { - host = "unix:///var/run/docker.sock" +data "coder_provisioner" "me" { } -provider "coder" { +provider "docker" { } data "coder_workspace" "me" { @@ -38,13 +37,13 @@ variable "dotfiles_uri" { } resource "coder_agent" "main" { - arch = "amd64" + arch = data.coder_provisioner.me.arch os = "linux" startup_script = var.dotfiles_uri != "" ? "coder dotfiles -y ${var.dotfiles_uri}" : null } resource "docker_volume" "home_volume" { - name = "coder-${data.coder_workspace.me.owner}-${data.coder_workspace.me.name}-root" + name = "coder-${data.coder_workspace.me.owner}-${lower(data.coder_workspace.me.name)}-root" } resource "docker_container" "workspace" { diff --git a/examples/templates/docker/main.tf b/examples/templates/docker/main.tf index 1aad84d324f76..904e2f5907fb5 100644 --- a/examples/templates/docker/main.tf +++ b/examples/templates/docker/main.tf @@ -2,71 +2,26 @@ terraform { required_providers { coder = { source = "coder/coder" - version = "0.4.3" + version = "0.4.5" } docker = { source = "kreuzwerker/docker" - version = "~> 2.16.0" + version = "~> 2.20.2" } } } -# Admin parameters - -# Comment this out if you are specifying a different docker -# host on the "docker" provider below. -variable "step1_docker_host_warning" { - description = <<-EOF - This template will use the Docker socket present on - the Coder host, which is not necessarily your local machine. - - You can specify a different host in the template file and - suppress this warning. - EOF - validation { - condition = contains(["Continue using /var/run/docker.sock on the Coder host"], var.step1_docker_host_warning) - error_message = "Cancelling template create." - } - - sensitive = true -} -variable "step2_arch" { - description = <<-EOF - arch: What architecture is your Docker host on? - - note: codercom/enterprise-* images are only built for amd64 - EOF - - validation { - condition = contains(["amd64", "arm64", "armv7"], var.step2_arch) - error_message = "Value must be amd64, arm64, or armv7." - } - sensitive = true -} -variable "step3_OS" { - description = <<-EOF - What operating system is your Coder host on? - EOF - - validation { - condition = contains(["MacOS", "Windows", "Linux"], var.step3_OS) - error_message = "Value must be MacOS, Windows, or Linux." - } - sensitive = true +data "coder_provisioner" "me" { } provider "docker" { - host = var.step3_OS == "Windows" ? "npipe:////.//pipe//docker_engine" : "unix:///var/run/docker.sock" -} - -provider "coder" { } data "coder_workspace" "me" { } resource "coder_agent" "main" { - arch = var.step2_arch + arch = data.coder_provisioner.me.arch os = "linux" startup_script = <