change Docker main.tf to be multiline and make the README.md wrap more nicely (#2537)

ketang · web-flow · commit 93b78755a6d4 · 2022-06-21T05:34:14.000-05:00
see issue #2385
diff --git a/examples/templates/docker/README.md b/examples/templates/docker/README.md
@@ -26,9 +26,9 @@ variable "docker_image" {
   description = "What Docker image would you like to use for your workspace?"
   default     = "codercom/enterprise-base:ubuntu"
   validation {
--    condition     = contains(["codercom/enterprise-base:ubuntu", "codercom/enterprise-node:ubuntu", "codercom/enterprise-intellij:ubuntu"], var.docker_image)
-+    condition     = contains(["codercom/enterprise-base:ubuntu", "codercom/enterprise-node:ubuntu", "codercom/enterprise-intellij:ubuntu", "codercom/enterprise-golang:ubuntu"], var.docker_image)
-
+    condition     = contains(["codercom/enterprise-base:ubuntu", "codercom/enterprise-node:ubuntu",
+-                              "codercom/enterprise-intellij:ubuntu"], var.docker_image)
++                              "codercom/enterprise-intellij:ubuntu", "codercom/enterprise-golang:ubuntu"], var.docker_image)
     error_message = "Invalid Docker image!"
   }
 }
diff --git a/examples/templates/docker/main.tf b/examples/templates/docker/main.tf
@@ -75,7 +75,8 @@ variable "docker_image" {
   # The codercom/enterprise-* images are only built for amd64
   default = "codercom/enterprise-base:ubuntu"
   validation {
-    condition     = contains(["codercom/enterprise-base:ubuntu", "codercom/enterprise-node:ubuntu", "codercom/enterprise-intellij:ubuntu"], var.docker_image)
+    condition     = contains(["codercom/enterprise-base:ubuntu", "codercom/enterprise-node:ubuntu",
+                              "codercom/enterprise-intellij:ubuntu", "codercom/enterprise-golang:ubuntu"], var.docker_image)
     error_message = "Invalid Docker image!"
   }
 

Original file line number	Diff line number	Diff line change
`@@ -26,9 +26,9 @@ variable "docker_image" {`
`26`	`26`	`description = "What Docker image would you like to use for your workspace?"`
`27`	`27`	`default = "codercom/enterprise-base:ubuntu"`
`28`	`28`	`validation {`
`29`		`-- condition = contains(["codercom/enterprise-base:ubuntu", "codercom/enterprise-node:ubuntu", "codercom/enterprise-intellij:ubuntu"], var.docker_image)`
`30`		`-+ condition = contains(["codercom/enterprise-base:ubuntu", "codercom/enterprise-node:ubuntu", "codercom/enterprise-intellij:ubuntu", "codercom/enterprise-golang:ubuntu"], var.docker_image)`
`31`		`-`
	`29`	`+ condition = contains(["codercom/enterprise-base:ubuntu", "codercom/enterprise-node:ubuntu",`
	`30`	`+- "codercom/enterprise-intellij:ubuntu"], var.docker_image)`
	`31`	`++ "codercom/enterprise-intellij:ubuntu", "codercom/enterprise-golang:ubuntu"], var.docker_image)`
`32`	`32`	`error_message = "Invalid Docker image!"`
`33`	`33`	`}`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,8 @@ variable "docker_image" {`
`75`	`75`	`# The codercom/enterprise-* images are only built for amd64`
`76`	`76`	`default = "codercom/enterprise-base:ubuntu"`
`77`	`77`	`validation {`
`78`		`- condition = contains(["codercom/enterprise-base:ubuntu", "codercom/enterprise-node:ubuntu", "codercom/enterprise-intellij:ubuntu"], var.docker_image)`
	`78`	`+ condition = contains(["codercom/enterprise-base:ubuntu", "codercom/enterprise-node:ubuntu",`
	`79`	`+ "codercom/enterprise-intellij:ubuntu", "codercom/enterprise-golang:ubuntu"], var.docker_image)`
`79`	`80`	`error_message = "Invalid Docker image!"`
`80`	`81`	`}`
`81`	`82`