Skip to content

Commit cf8a144

Browse files
kevinh-canvakevinh-canva
committed
Merge remote-tracking branch 'upstream/main' into kevinh-add-workspace-timing-metrics
2 parents 50f6300 + 1bac277 commit cf8a144

File tree

9 files changed

+108
-89
lines changed

9 files changed

+108
-89
lines changed

‎examples/templates/aws-linux/main.tf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ terraform {
33
coder = {
44
source = "coder/coder"
55
}
6+
cloudinit = {
7+
source = "hashicorp/cloudinit"
8+
}
69
aws = {
710
source = "hashicorp/aws"
811
}

‎examples/templates/kubernetes-envbox/main.tf

Lines changed: 32 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ variable "use_kubeconfig" {
3434
EOF
3535
}
3636

37-
provider "coder" {
38-
}
37+
provider "coder" {}
3938

4039
variable "namespace" {
4140
type = string
@@ -95,30 +94,40 @@ resource "coder_agent" "main" {
9594
cp /etc/skel/.bashrc $HOME
9695
fi
9796
98-
# Install the latest code-server.
99-
# Append "--version x.x.x" to install a specific version of code-server.
100-
curl -fsSL https://code-server.dev/install.sh | sh -s -- --method=standalone --prefix=/tmp/code-server
101-
102-
# Start code-server in the background.
103-
/tmp/code-server/bin/code-server --auth none --port 13337 >/tmp/code-server.log 2>&1 &
97+
# Add any commands that should be executed at workspace startup (e.g install requirements, start a program, etc) here
10498
EOT
10599
}
106100

107-
# code-server
108-
resource "coder_app" "code-server" {
109-
agent_id = coder_agent.main.id
110-
slug = "code-server"
111-
display_name = "code-server"
112-
icon = "/icon/code.svg"
113-
url = "http://localhost:13337?folder=/home/coder"
114-
subdomain = false
115-
share = "owner"
116-
117-
healthcheck {
118-
url = "http://localhost:13337/healthz"
119-
interval = 3
120-
threshold = 10
121-
}
101+
# See https://registry.coder.com/modules/code-server
102+
module "code-server" {
103+
count = data.coder_workspace.me.start_count
104+
source = "registry.coder.com/modules/code-server/coder"
105+
106+
# This ensures that the latest version of the module gets downloaded, you can also pin the module version to prevent breaking changes in production.
107+
version = ">= 1.0.0"
108+
109+
agent_id = coder_agent.main.id
110+
order = 1
111+
}
112+
113+
# See https://registry.coder.com/modules/jetbrains-gateway
114+
module "jetbrains_gateway" {
115+
count = data.coder_workspace.me.start_count
116+
source = "registry.coder.com/modules/jetbrains-gateway/coder"
117+
118+
# JetBrains IDEs to make available for the user to select
119+
jetbrains_ides = ["IU", "PY", "WS", "PS", "RD", "CL", "GO", "RM"]
120+
default = "IU"
121+
122+
# Default folder to open when starting a JetBrains IDE
123+
folder = "/home/coder"
124+
125+
# This ensures that the latest version of the module gets downloaded, you can also pin the module version to prevent breaking changes in production.
126+
version = ">= 1.0.0"
127+
128+
agent_id = coder_agent.main.id
129+
agent_name = "main"
130+
order = 2
122131
}
123132

124133
resource "kubernetes_persistent_volume_claim" "home" {

‎go.mod

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ require (
101101
github.com/fatih/color v1.18.0
102102
github.com/fatih/structs v1.1.0
103103
github.com/fatih/structtag v1.2.0
104-
github.com/fergusstrange/embedded-postgres v1.29.0
104+
github.com/fergusstrange/embedded-postgres v1.30.0
105105
github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa
106106
github.com/gen2brain/beeep v0.0.0-20220402123239-6a3042f4b71a
107107
github.com/gliderlabs/ssh v0.3.4
@@ -183,9 +183,9 @@ require (
183183
golang.org/x/sys v0.28.0
184184
golang.org/x/term v0.27.0
185185
golang.org/x/text v0.21.0
186-
golang.org/x/tools v0.27.0
186+
golang.org/x/tools v0.28.0
187187
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da
188-
google.golang.org/api v0.209.0
188+
google.golang.org/api v0.210.0
189189
google.golang.org/grpc v1.68.0
190190
google.golang.org/protobuf v1.35.2
191191
gopkg.in/DataDog/dd-trace-go.v1 v1.69.0
@@ -216,8 +216,8 @@ require (
216216
)
217217

218218
require (
219-
cloud.google.com/go/auth v0.10.2 // indirect
220-
cloud.google.com/go/auth/oauth2adapt v0.2.5 // indirect
219+
cloud.google.com/go/auth v0.11.0 // indirect
220+
cloud.google.com/go/auth/oauth2adapt v0.2.6 // indirect
221221
dario.cat/mergo v1.0.0 // indirect
222222
github.com/DataDog/go-libddwaf/v3 v3.4.0 // indirect
223223
github.com/alecthomas/chroma/v2 v2.14.0 // indirect
@@ -438,9 +438,9 @@ require (
438438
golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230429144221-925a1e7659e6 // indirect
439439
golang.zx2c4.com/wireguard/windows v0.5.3 // indirect
440440
google.golang.org/appengine v1.6.8 // indirect
441-
google.golang.org/genproto v0.0.0-20241113202542-65e8d215514f // indirect
442-
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect
443-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241113202542-65e8d215514f // indirect
441+
google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect
442+
google.golang.org/genproto/googleapis/api v0.0.0-20241113202542-65e8d215514f // indirect
443+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241118233622-e639e219e697 // indirect
444444
gopkg.in/yaml.v2 v2.4.0 // indirect
445445
howett.net/plist v1.0.0 // indirect
446446
inet.af/peercred v0.0.0-20210906144145-0893ea02156a // indirect

‎go.sum

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
cdr.dev/slog v1.6.2-0.20241112041820-0ec81e6e67bb h1:4MKA8lBQLnCqj2myJCb5Lzoa65y0tABO4gHrxuMdsCQ=
22
cdr.dev/slog v1.6.2-0.20241112041820-0ec81e6e67bb/go.mod h1:NaoTA7KwopCrnaSb0JXTC0PTp/O/Y83Lndnq0OEV3ZQ=
33
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
4-
cloud.google.com/go/auth v0.10.2 h1:oKF7rgBfSHdp/kuhXtqU/tNDr0mZqhYbEh+6SiqzkKo=
5-
cloud.google.com/go/auth v0.10.2/go.mod h1:xxA5AqpDrvS+Gkmo9RqrGGRh6WSNKKOXhY3zNOr38tI=
6-
cloud.google.com/go/auth/oauth2adapt v0.2.5 h1:2p29+dePqsCHPP1bqDJcKj4qxRyYCcbzKpFyKGt3MTk=
7-
cloud.google.com/go/auth/oauth2adapt v0.2.5/go.mod h1:AlmsELtlEBnaNTL7jCj8VQFLy6mbZv0s4Q7NGBeQ5E8=
4+
cloud.google.com/go/auth v0.11.0 h1:Ic5SZz2lsvbYcWT5dfjNWgw6tTlGi2Wc8hyQSC9BstA=
5+
cloud.google.com/go/auth v0.11.0/go.mod h1:xxA5AqpDrvS+Gkmo9RqrGGRh6WSNKKOXhY3zNOr38tI=
6+
cloud.google.com/go/auth/oauth2adapt v0.2.6 h1:V6a6XDu2lTwPZWOawrAa9HUK+DB2zfJyTuciBG5hFkU=
7+
cloud.google.com/go/auth/oauth2adapt v0.2.6/go.mod h1:AlmsELtlEBnaNTL7jCj8VQFLy6mbZv0s4Q7NGBeQ5E8=
88
cloud.google.com/go/compute/metadata v0.5.2 h1:UxK4uu/Tn+I3p2dYWTfiX4wva7aYlKixAHn3fyqngqo=
99
cloud.google.com/go/compute/metadata v0.5.2/go.mod h1:C66sj2AluDcIqakBq/M8lw8/ybHgOZqin2obFxa/E5k=
1010
cloud.google.com/go/logging v1.12.0 h1:ex1igYcGFd4S/RZWOCU51StlIEuey5bjqwH9ZYjHibk=
@@ -315,8 +315,8 @@ github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4
315315
github.com/felixge/httpsnoop v1.0.2/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
316316
github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
317317
github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
318-
github.com/fergusstrange/embedded-postgres v1.29.0 h1:Uv8hdhoiaNMuH0w8UuGXDHr60VoAQPFdgx7Qf3bzXJM=
319-
github.com/fergusstrange/embedded-postgres v1.29.0/go.mod h1:t/MLs0h9ukYM6FSt99R7InCHs1nW0ordoVCcnzmpTYw=
318+
github.com/fergusstrange/embedded-postgres v1.30.0 h1:ewv1e6bBlqOIYtgGgRcEnNDpfGlmfPxB8T3PO9tV68Q=
319+
github.com/fergusstrange/embedded-postgres v1.30.0/go.mod h1:w0YvnCgf19o6tskInrOOACtnqfVlOvluz3hlNLY7tRk=
320320
github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw=
321321
github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
322322
github.com/foxcpp/go-mockdns v1.1.0 h1:jI0rD8M0wuYAxL7r/ynTrCQQq0BVqfB99Vgk7DlmewI=
@@ -1186,8 +1186,8 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f
11861186
golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
11871187
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
11881188
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
1189-
golang.org/x/tools v0.27.0 h1:qEKojBykQkQ4EynWy4S8Weg69NumxKdn40Fce3uc/8o=
1190-
golang.org/x/tools v0.27.0/go.mod h1:sUi0ZgbwW9ZPAq26Ekut+weQPR5eIM6GQLQ1Yjm1H0Q=
1189+
golang.org/x/tools v0.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8=
1190+
golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw=
11911191
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
11921192
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
11931193
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -1200,21 +1200,21 @@ golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230429144221-925a1e7659e6 h1:CawjfCvY
12001200
golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230429144221-925a1e7659e6/go.mod h1:3rxYc4HtVcSG9gVaTs2GEBdehh+sYPOwKtyUWEOTb80=
12011201
golang.zx2c4.com/wireguard/windows v0.5.3 h1:On6j2Rpn3OEMXqBq00QEDC7bWSZrPIHKIus8eIuExIE=
12021202
golang.zx2c4.com/wireguard/windows v0.5.3/go.mod h1:9TEe8TJmtwyQebdFwAkEWOPr3prrtqm+REGFifP60hI=
1203-
google.golang.org/api v0.209.0 h1:Ja2OXNlyRlWCWu8o+GgI4yUn/wz9h/5ZfFbKz+dQX+w=
1204-
google.golang.org/api v0.209.0/go.mod h1:I53S168Yr/PNDNMi5yPnDc0/LGRZO6o7PoEbl/HY3CM=
1203+
google.golang.org/api v0.210.0 h1:HMNffZ57OoZCRYSbdWVRoqOa8V8NIHLL0CzdBPLztWk=
1204+
google.golang.org/api v0.210.0/go.mod h1:B9XDZGnx2NtyjzVkOVTGrFSAVZgPcbedzKg/gTLwqBs=
12051205
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
12061206
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
12071207
google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM=
12081208
google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds=
12091209
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
12101210
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
12111211
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
1212-
google.golang.org/genproto v0.0.0-20241113202542-65e8d215514f h1:zDoHYmMzMacIdjNe+P2XiTmPsLawi/pCbSPfxt6lTfw=
1213-
google.golang.org/genproto v0.0.0-20241113202542-65e8d215514f/go.mod h1:Q5m6g8b5KaFFzsQFIGdJkSJDGeJiybVenoYFMMa3ohI=
1214-
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 h1:M0KvPgPmDZHPlbRbaNU1APr28TvwvvdUPlSv7PUvy8g=
1215-
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:dguCy7UOdZhTvLzDyt15+rOrawrpM4q7DD9dQ1P11P4=
1216-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241113202542-65e8d215514f h1:C1QccEa9kUwvMgEUORqQD9S17QesQijxjZ84sO82mfo=
1217-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241113202542-65e8d215514f/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI=
1212+
google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 h1:ToEetK57OidYuqD4Q5w+vfEnPvPpuTwedCNVohYJfNk=
1213+
google.golang.org/genproto v0.0.0-20241118233622-e639e219e697/go.mod h1:JJrvXBWRZaFMxBufik1a4RpFw4HhgVtBBWQeQgUj2cc=
1214+
google.golang.org/genproto/googleapis/api v0.0.0-20241113202542-65e8d215514f h1:M65LEviCfuZTfrfzwwEoxVtgvfkFkBUbFnRbxCXuXhU=
1215+
google.golang.org/genproto/googleapis/api v0.0.0-20241113202542-65e8d215514f/go.mod h1:Yo94eF2nj7igQt+TiJ49KxjIH8ndLYPZMIRSiRcEbg0=
1216+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241118233622-e639e219e697 h1:LWZqQOEjDyONlF1H6afSWpAL/znlREo2tHfLoe+8LMA=
1217+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241118233622-e639e219e697/go.mod h1:5uTbfoYQed2U9p3KIj2/Zzm02PYhndfdmML0qC3q3FU=
12181218
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
12191219
google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
12201220
google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=

‎offlinedocs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"format:check": "prettier --cache --check './**/*.{css,html,js,json,jsx,md,ts,tsx,yaml,yml}'"
1414
},
1515
"dependencies": {
16-
"@chakra-ui/react": "2.10.3",
16+
"@chakra-ui/react": "2.10.4",
1717
"@emotion/react": "11.13.3",
1818
"@emotion/styled": "11.13.0",
1919
"archiver": "6.0.2",

‎offlinedocs/pnpm-lock.yaml

Lines changed: 36 additions & 36 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎scripts/Dockerfile.base

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This is the base image used for Coder images. It's a multi-arch image that is
22
# built in depot.dev for all supported architectures. Since it's built on real
33
# hardware and not cross-compiled, it can have "RUN" commands.
4-
FROM alpine:3.20.3
4+
FROM alpine:3.21.0
55

66
# We use a single RUN command to reduce the number of layers in the image.
77
# NOTE: Keep the Terraform version in sync with minTerraformVersion and

0 commit comments

Comments
 (0)