more fixups

johnstcn · johnstcn · commit fec423b84687 · 2025-03-11T11:36:45.000Z
diff --git a/dogfood/coder-envbuilder/main.tf b/dogfood/coder-envbuilder/main.tf
@@ -43,7 +43,7 @@ data "coder_parameter" "devcontainer_repo" {
 data "coder_parameter" "devcontainer_dir" {
   type        = "string"
   name        = "Devcontainer Directory"
-  default     = "dogfood/coder/contents/"
+  default     = "dogfood/coder/"
   description = "Directory containing a devcontainer.json relative to the repository root"
   mutable     = true
 }
diff --git a/dogfood/coder/update-keys.sh b/dogfood/coder/update-keys.sh
@@ -15,7 +15,7 @@ gpg_flags=(
 	--yes
 )
 
-pushd "$PROJECT_ROOT/dogfood/coder/contents/files/usr/share/keyrings"
+pushd "$PROJECT_ROOT/dogfood/coder/files/usr/share/keyrings"
 
 # Ansible PPA signing key
 curl "${curl_flags[@]}" "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x6125e2a8c77f2818fb7bd15b93c4a3fd7bb9c367" |

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/coder/contents/"`
	`46`	`+ default = "dogfood/coder/"`
`47`	`47`	`description = "Directory containing a devcontainer.json relative to the repository root"`
`48`	`48`	`mutable = true`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ gpg_flags=(`
`15`	`15`	`--yes`
`16`	`16`	`)`
`17`	`17`
`18`		`-pushd "$PROJECT_ROOT/dogfood/coder/contents/files/usr/share/keyrings"`
	`18`	`+pushd "$PROJECT_ROOT/dogfood/coder/files/usr/share/keyrings"`
`19`	`19`
`20`	`20`	`# Ansible PPA signing key`
`21`	`21`	`curl "${curl_flags[@]}" "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x6125e2a8c77f2818fb7bd15b93c4a3fd7bb9c367" \|`