Skip to content

Commit a84db0b

Browse files
matifalimatifali
committed
update docker examples
1 parent 59b18d1 commit a84db0b

File tree

4 files changed

+25
-26
lines changed

4 files changed

+25
-26
lines changed

‎examples/templates/docker-code-server/main.tf

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ terraform {
22
required_providers {
33
coder = {
44
source = "coder/coder"
5-
version = "~> 0.6.14"
5+
version = "~> 0.6.17"
66
}
77
docker = {
88
source = "kreuzwerker/docker"
@@ -21,9 +21,8 @@ data "coder_workspace" "me" {
2121
}
2222

2323
resource "coder_agent" "main" {
24-
arch = data.coder_provisioner.me.arch
25-
os = "linux"
26-
24+
arch = data.coder_provisioner.me.arch
25+
os = "linux"
2726
login_before_ready = false
2827
startup_script_timeout = 180
2928
startup_script = <<-EOT

‎examples/templates/docker-image-builds/main.tf

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ terraform {
33
required_providers {
44
coder = {
55
source = "coder/coder"
6-
version = "~> 0.6.14"
6+
version = "~> 0.6.17"
77
}
88
docker = {
99
source = "kreuzwerker/docker"
@@ -22,9 +22,8 @@ data "coder_workspace" "me" {
2222
}
2323

2424
resource "coder_agent" "main" {
25-
arch = data.coder_provisioner.me.arch
26-
os = "linux"
27-
25+
arch = data.coder_provisioner.me.arch
26+
os = "linux"
2827
login_before_ready = false
2928
startup_script_timeout = 180
3029
startup_script = <<-EOT
@@ -50,7 +49,6 @@ resource "coder_app" "code-server" {
5049
interval = 3
5150
threshold = 10
5251
}
53-
5452
}
5553

5654
data "coder_parameter" "docker_image" {
@@ -77,7 +75,6 @@ data "coder_parameter" "docker_image" {
7775
}
7876
}
7977

80-
8178
resource "docker_volume" "home_volume" {
8279
name = "coder-${data.coder_workspace.me.id}-home"
8380
# Protect the volume from being deleted due to changes in attributes.
@@ -112,7 +109,6 @@ resource "docker_image" "coder_image" {
112109
dockerfile = "${data.coder_parameter.docker_image.value}.Dockerfile"
113110
tag = ["coder-${data.coder_parameter.docker_image.value}:v0.1"]
114111
}
115-
116112
# Keep alive for other workspaces to use upon deletion
117113
keep_locally = true
118114
}

‎examples/templates/docker-with-dotfiles/main.tf

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ terraform {
99
required_providers {
1010
coder = {
1111
source = "coder/coder"
12-
version = "~> 0.6.14"
12+
version = "~> 0.6.17"
1313
}
1414
docker = {
1515
source = "kreuzwerker/docker"
@@ -27,26 +27,33 @@ provider "docker" {
2727
data "coder_workspace" "me" {
2828
}
2929

30-
variable "docker_image" {
31-
default = "codercom/enterprise-base:ubuntu"
30+
data "coder_parameter" "docker_image" {
31+
name = "What Docker image would you like to use for your workspace?"
32+
description = "The Docker image will be used to build your workspace."
33+
default = "codercom/enterprise-base:ubuntu"
34+
icon = "/icon/docker.png"
35+
type = "string"
36+
mutable = true
3237
}
3338

34-
variable "dotfiles_uri" {
39+
data "coder_parameter" "dotfiles_uri" {
40+
name = "What dotfiles repo would you like to use for your workspace?"
3541
description = <<-EOF
3642
Dotfiles repo URI (optional)
3743
3844
see https://dotfiles.github.io
3945
EOF
4046
default = ""
47+
type = "string"
48+
mutable = true
4149
}
4250

4351
resource "coder_agent" "main" {
44-
arch = data.coder_provisioner.me.arch
45-
os = "linux"
46-
52+
arch = data.coder_provisioner.me.arch
53+
os = "linux"
4754
login_before_ready = false
4855
startup_script_timeout = 180
49-
env = { "DOTFILES_URI" = var.dotfiles_uri != "" ? var.dotfiles_uri : null }
56+
env = { "DOTFILES_URI" = data.coder_parameter.dotfiles_uri.value != "" ? data.coder_parameter.dotfiles_uri.value : null }
5057
startup_script = <<-EOT
5158
set -e
5259
if [ -n "$DOTFILES_URI" ]; then
@@ -85,7 +92,7 @@ resource "docker_volume" "home_volume" {
8592

8693
resource "docker_container" "workspace" {
8794
count = data.coder_workspace.me.start_count
88-
image = var.docker_image
95+
image = data.coder_parameter.docker_image.value
8996
# Uses lower() to avoid Docker restriction on container names.
9097
name = "coder-${data.coder_workspace.me.owner}-${lower(data.coder_workspace.me.name)}"
9198
# Hostname makes the shell more user friendly: coder@my-workspace:~$

‎examples/templates/docker/main.tf

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ terraform {
22
required_providers {
33
coder = {
44
source = "coder/coder"
5-
version = "~> 0.6.14"
5+
version = "~> 0.6.17"
66
}
77
docker = {
88
source = "kreuzwerker/docker"
@@ -25,9 +25,8 @@ data "coder_workspace" "me" {
2525
}
2626

2727
resource "coder_agent" "main" {
28-
arch = data.coder_provisioner.me.arch
29-
os = "linux"
30-
28+
arch = data.coder_provisioner.me.arch
29+
os = "linux"
3130
login_before_ready = false
3231
startup_script_timeout = 180
3332
startup_script = <<-EOT
@@ -66,7 +65,6 @@ resource "coder_app" "code-server" {
6665
}
6766
}
6867

69-
7068
resource "docker_volume" "home_volume" {
7169
name = "coder-${data.coder_workspace.me.id}-home"
7270
# Protect the volume from being deleted due to changes in attributes.
@@ -94,7 +92,6 @@ resource "docker_volume" "home_volume" {
9492
}
9593
}
9694

97-
9895
resource "docker_image" "main" {
9996
name = "coder-${data.coder_workspace.me.id}"
10097
build {

0 commit comments

Comments
 (0)