Skip to content

Commit ad3cb79

Browse files
committed
Merge branch 'main' into entfactor
2 parents b4cbd6c + 938bd73 commit ad3cb79

File tree

5 files changed

+10
-1
lines changed

5 files changed

+10
-1
lines changed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ provider "docker" {
2727
data "coder_workspace" "me" {
2828
}
2929

30+
variable "docker_image" {
31+
default = "codercom/enterprise-base:ubuntu"
32+
}
33+
3034
variable "dotfiles_uri" {
3135
description = <<-EOF
3236
Dotfiles repo URI (optional)
@@ -48,7 +52,7 @@ resource "docker_volume" "home_volume" {
4852

4953
resource "docker_container" "workspace" {
5054
count = data.coder_workspace.me.start_count
51-
image = "codercom/enterprise-base:ubuntu"
55+
image = var.docker_image
5256
# Uses lower() to avoid Docker restriction on container names.
5357
name = "coder-${data.coder_workspace.me.owner}-${lower(data.coder_workspace.me.name)}"
5458
dns = ["1.1.1.1"]

helm/templates/service.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ metadata:
66
name: coder
77
labels:
88
{{- include "coder.labels" . | nindent 4 }}
9+
annotations:
10+
{{- toYaml .Values.coder.service.annotations | nindent 4 }}
911
spec:
1012
type: {{ .Values.coder.service.type }}
1113
ports:

helm/values.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,3 +78,6 @@ coder:
7878
# your cloud and specify it here in production to avoid accidental IP
7979
# address changes.
8080
loadBalancerIP: ""
81+
# coder.service.annotations -- The service annotations. See:
82+
# https://kubernetes.io/docs/concepts/services-networking/service/#internal-load-balancer
83+
annotations: {}

0 commit comments

Comments
 (0)