address PR comments

johnstcn · johnstcn · commit 31ee3578a17f · 2025-03-10T09:45:46.000Z
diff --git a/.github/workflows/dogfood.yaml b/.github/workflows/dogfood.yaml
@@ -196,7 +196,7 @@ jobs:
           CODER_URL: https://dev.coder.com
           CODER_SESSION_TOKEN: ${{ secrets.CODER_SESSION_TOKEN }}
           # Template source & details
+          TF_VAR_CODER_TEMPLATE_NAME: "${{ secrets.CODER_TEMPLATE_NAME }}-envbuilder"
           TF_VAR_CODER_TEMPLATE_VERSION: ${{ steps.vars.outputs.sha_short }}
-          TF_VAR_CODER_TEMPLATE_DIR: ./contents
           TF_VAR_CODER_TEMPLATE_MESSAGE: ${{ steps.message.outputs.pr_title }}
           TF_LOG: info
diff --git a/dogfood/coder-envbuilder/contents/main.tf b/dogfood/coder-envbuilder/contents/main.tf
@@ -43,7 +43,7 @@ data "coder_parameter" "devcontainer_repo" {
 data "coder_parameter" "devcontainer_dir" {
   type        = "string"
   name        = "Devcontainer Directory"
-  default     = "dogfood/contents/"
+  default     = "dogfood/coder/contents/"
   description = "Directory containing a devcontainer.json relative to the repository root"
   mutable     = true
 }
diff --git a/dogfood/coder-envbuilder/main.tf b/dogfood/coder-envbuilder/main.tf
diff --git a/dogfood/main.tf b/dogfood/main.tf
@@ -4,9 +4,9 @@ terraform {
       source = "coder/coderd"
     }
   }
-  backend "gcs" {
-    bucket = "coder-dogfood-tf-state"
-  }
+  # backend "gcs" {
+  # bucket = "coder-dogfood-tf-state"
+  # }
 }
 
 data "coderd_organization" "default" {
@@ -43,8 +43,55 @@ resource "coderd_template" "dogfood" {
     {
       name      = var.CODER_TEMPLATE_VERSION
       message   = var.CODER_TEMPLATE_MESSAGE
-      directory = var.CODER_TEMPLATE_DIR
+      directory = "./coder/contents"
+      active    = true
+    }
+  ]
+  acl = {
+    groups = [{
+      id   = data.coderd_organization.default.id
+      role = "use"
+    }]
+    users = [{
+      id   = data.coderd_user.machine.id
+      role = "admin"
+    }]
+  }
+  activity_bump_ms                  = 10800000
+  allow_user_auto_start             = true
+  allow_user_auto_stop              = true
+  allow_user_cancel_workspace_jobs  = false
+  auto_start_permitted_days_of_week = ["friday", "monday", "saturday", "sunday", "thursday", "tuesday", "wednesday"]
+  auto_stop_requirement = {
+    days_of_week = ["sunday"]
+    weeks        = 1
+  }
+  default_ttl_ms                 = 28800000
+  deprecation_message            = null
+  failure_ttl_ms                 = 604800000
+  require_active_version         = true
+  time_til_dormant_autodelete_ms = 7776000000
+  time_til_dormant_ms            = 8640000000
+}
+
+
+resource "coderd_template" "envbuilder_dogfood" {
+  name            = "coder-envbuilder"
+  display_name    = "Write Coder on Coder using Envbuilder"
+  description     = "Write Coder on Coder using a workspace built by Envbuilder."
+  icon            = "/emojis/1f3d7.png" # 🏗️
+  organization_id = "703f72a1-76f6-4f89-9de6-8a3989693fe5"
+  versions = [
+    {
+      name      = var.CODER_TEMPLATE_VERSION
+      message   = var.CODER_TEMPLATE_MESSAGE
+      directory = "./coder-envbuilder/contents"
       active    = true
+      tf_vars = [{
+        # clusters/dogfood-v2/coder/provisioner/configs/values.yaml#L191-L194
+        name  = "envbuilder_cache_dockerconfigjson_path"
+        value = "/home/coder/envbuilder-cache-dockerconfig.json"
+      }]
     }
   ]
   acl = {

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ data "coder_parameter" "devcontainer_repo" {`
`43`	`43`	`data "coder_parameter" "devcontainer_dir" {`
`44`	`44`	`type = "string"`
`45`	`45`	`name = "Devcontainer Directory"`
`46`		`- default = "dogfood/contents/"`
	`46`	`+ default = "dogfood/coder/contents/"`
`47`	`47`	`description = "Directory containing a devcontainer.json relative to the repository root"`
`48`	`48`	`mutable = true`
`49`	`49`	`}`