fix: Reduce variables needed for Docker template

kylecarbs · kylecarbs · commit fdb76f22aa59 · 2022-08-09T23:25:48.000Z
This should make initial setup a bit simpler!
diff --git a/examples/templates/docker-code-server/main.tf b/examples/templates/docker-code-server/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.4.3"
+      version = "0.4.5"
     }
     docker = {
       source  = "kreuzwerker/docker"
@@ -11,32 +11,18 @@ terraform {
   }
 }
 
-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
+  host = data.coder_provisioner.me.os == "windows" ? "npipe:////.//pipe//docker_engine" : "unix:///var/run/docker.sock"
 }
 
 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
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.4.3"
+      version = "0.4.5"
     }
     docker = {
       source  = "kreuzwerker/docker"
@@ -12,56 +12,18 @@ terraform {
   }
 }
 
-# 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" {
+   host = data.coder_provisioner.me.os == "windows" ? "npipe:////.//pipe//docker_engine" : "unix:///var/run/docker.sock"
 }
 
 data "coder_workspace" "me" {
 }
 
 resource "coder_agent" "main" {
-  arch = var.step2_arch
+  arch = data.coder_provisioner.me.arch
   os   = "linux"
 }
 
@@ -84,7 +46,7 @@ variable "docker_image" {
 }
 
 resource "docker_volume" "home_volume" {
-  name = "coder-${data.coder_workspace.me.owner}-${lower(data.coder_workspace.me.name)}-root"
+  name = "coder-${data.coder_workspace.me.owner_id}-${lower(data.coder_workspace.me.id)}-root"
 }
 
 resource "docker_image" "coder_image" {
diff --git a/examples/templates/docker-with-dotfiles/main.tf b/examples/templates/docker-with-dotfiles/main.tf
@@ -9,7 +9,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.4.3"
+      version = "0.4.5"
     }
     docker = {
       source  = "kreuzwerker/docker"
@@ -18,11 +18,11 @@ terraform {
   }
 }
 
-provider "docker" {
-  host = "unix:///var/run/docker.sock"
+data "coder_provisioner" "me" {
 }
 
-provider "coder" {
+provider "docker" {
+   host = data.coder_provisioner.me.os == "windows" ? "npipe:////.//pipe//docker_engine" : "unix:///var/run/docker.sock"
 }
 
 data "coder_workspace" "me" {
@@ -38,13 +38,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_id}-${data.coder_workspace.me.id}-root"
 }
 
 resource "docker_container" "workspace" {
diff --git a/examples/templates/docker/main.tf b/examples/templates/docker/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.4.3"
+      version = "0.4.5"
     }
     docker = {
       source  = "kreuzwerker/docker"
@@ -11,62 +11,18 @@ terraform {
   }
 }
 
-# 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" {
+  # host = data.coder_provisioner.me.os == "windows" ? "npipe:////.//pipe//docker_engine" : "unix:///var/run/docker.sock"
 }
 
 data "coder_workspace" "me" {
 }
 
 resource "coder_agent" "main" {
-  arch           = var.step2_arch
+  arch           = data.coder_provisioner.me.arch
   os             = "linux"
   startup_script = <<EOF
     #!/bin/sh
@@ -104,11 +60,10 @@ variable "docker_image" {
     "codercom/enterprise-intellij:ubuntu", "codercom/enterprise-golang:ubuntu"], var.docker_image)
     error_message = "Invalid Docker image!"
   }
-
 }
 
 resource "docker_volume" "home_volume" {
-  name = "coder-${data.coder_workspace.me.owner}-${data.coder_workspace.me.name}-home"
+  name = "coder-${data.coder_workspace.me.owner_id}-${data.coder_workspace.me.id}-home"
 }
 
 resource "docker_container" "workspace" {
@@ -121,12 +76,7 @@ resource "docker_container" "workspace" {
   dns      = ["1.1.1.1"]
   # Use the docker gateway if the access URL is 127.0.0.1
   command = [
-    "sh", "-c",
-    <<EOT
-    trap '[ $? -ne 0 ] && echo === Agent script exited with non-zero code. Sleeping infinitely to preserve logs... && sleep infinity' EXIT
-    ${replace(coder_agent.main.init_script, "localhost", "host.docker.internal")}
-    EOT
-  ]
+    "sh", "-c", replace(coder_agent.main.init_script, "localhost", "host.docker.internal")]
   env = ["CODER_AGENT_TOKEN=${coder_agent.main.token}"]
   host {
     host = "host.docker.internal"

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ terraform {`
`9`	`9`	`required_providers {`
`10`	`10`	`coder = {`
`11`	`11`	`source = "coder/coder"`
`12`		`- version = "0.4.3"`
	`12`	`+ version = "0.4.5"`
`13`	`13`	`}`
`14`	`14`	`docker = {`
`15`	`15`	`source = "kreuzwerker/docker"`
`@@ -18,11 +18,11 @@ terraform {`
`18`	`18`	`}`
`19`	`19`	`}`
`20`	`20`
`21`		`-provider "docker" {`
`22`		`- host = "unix:///var/run/docker.sock"`
	`21`	`+data "coder_provisioner" "me" {`
`23`	`22`	`}`
`24`	`23`
`25`		`-provider "coder" {`
	`24`	`+provider "docker" {`
	`25`	`+ host = data.coder_provisioner.me.os == "windows" ? "npipe:////.//pipe//docker_engine" : "unix:///var/run/docker.sock"`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`data "coder_workspace" "me" {`
`@@ -38,13 +38,13 @@ variable "dotfiles_uri" {`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`resource "coder_agent" "main" {`
`41`		`- arch = "amd64"`
	`41`	`+ arch = data.coder_provisioner.me.arch`
`42`	`42`	`os = "linux"`
`43`	`43`	`startup_script = var.dotfiles_uri != "" ? "coder dotfiles -y ${var.dotfiles_uri}" : null`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`resource "docker_volume" "home_volume" {`
`47`		`- name = "coder-${data.coder_workspace.me.owner}-${data.coder_workspace.me.name}-root"`
	`47`	`+ name = "coder-${data.coder_workspace.me.owner_id}-${data.coder_workspace.me.id}-root"`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`resource "docker_container" "workspace" {`