From 450bad3b14d5de0b2c65d79f0995cec0a6952c02 Mon Sep 17 00:00:00 2001 From: Ketan Gangatirkar <33678+ketang@users.noreply.github.com> Date: Mon, 20 Jun 2022 16:10:17 -0500 Subject: [PATCH] change Docker main.tf to be multiline and make the README.md wrap more nicely see issue #2385 --- examples/templates/docker/README.md | 6 +++--- examples/templates/docker/main.tf | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/examples/templates/docker/README.md b/examples/templates/docker/README.md index 6a627472513c7..2feb9750fbc22 100644 --- 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 index f1f7e689b3aa5..be9b50b4c9760 100644 --- 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!" }