mirror of
https://github.com/coder/coder.git
synced 2026-09-24 15:04:27 +08:00
change Docker main.tf to be multiline and make the README.md wrap more nicely (#2537)
see issue #2385
This commit is contained in:
@@ -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!"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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!"
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user