Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 09dd69a

Browse files
johnstcnjohnstcn
authored
chore(dogfood): include multiple templates under dogfood/ (coder#16846)
* Renames `dogfood/contents` to `dogfood/coder`. * Moves `coder-envbuilder` to `dogfood/coder-envbuilder`. * Updates `dogfood/main.tf` to push `coder-envbuilder` template. * Replaces hard-coded organization IDs with `data.coderd_organization.default.id`.
1 parent 9ded2cc commit 09dd69a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+70
-16
lines changed

‎.github/dependabot.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ updates:
3737
# Update our Dockerfile.
3838
- package-ecosystem: "docker"
3939
directories:
40-
- "/dogfood/contents"
40+
- "/dogfood/coder"
41+
- "/dogfood/coder-envbuilder"
4142
- "/scripts"
4243
- "/examples/templates/docker/build"
4344
- "/examples/parameters/build"

‎.github/workflows/ci.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ jobs:
172172

173173
- name: Get golangci-lint cache dir
174174
run: |
175-
linter_ver=$(egrep -o 'GOLANGCI_LINT_VERSION=\S+' dogfood/contents/Dockerfile | cut -d '=' -f 2)
175+
linter_ver=$(egrep -o 'GOLANGCI_LINT_VERSION=\S+' dogfood/coder/Dockerfile | cut -d '=' -f 2)
176176
go install github.com/golangci/golangci-lint/cmd/golangci-lint@v$linter_ver
177177
dir=$(golangci-lint cache status | awk '/Dir/ { print $2 }')
178178
echo "LINT_CACHE_DIR=$dir" >> $GITHUB_ENV

‎.github/workflows/dogfood.yaml

+12-6
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
project: b4q6ltmpzh
6969
token: ${{ secrets.DEPOT_TOKEN }}
7070
buildx-fallback: true
71-
context: "{{defaultContext}}:dogfood/contents"
71+
context: "{{defaultContext}}:dogfood/coder"
7272
pull: true
7373
save: true
7474
push: ${{ github.ref == 'refs/heads/main' }}
@@ -113,12 +113,18 @@ jobs:
113113

114114
- name: Terraform init and validate
115115
run: |
116-
cd dogfood
117-
terraform init -upgrade
116+
pushd dogfood/
117+
terraform init
118+
terraform validate
119+
popd
120+
pushd dogfood/coder
121+
terraform init
118122
terraform validate
119-
cd contents
120-
terraform init -upgrade
123+
popd
124+
pushd dogfood/coder-envbuilder
125+
terraform init
121126
terraform validate
127+
popd
122128
123129
- name: Get short commit SHA
124130
if: github.ref == 'refs/heads/main'
@@ -142,6 +148,6 @@ jobs:
142148
# Template source & details
143149
TF_VAR_CODER_TEMPLATE_NAME: ${{ secrets.CODER_TEMPLATE_NAME }}
144150
TF_VAR_CODER_TEMPLATE_VERSION: ${{ steps.vars.outputs.sha_short }}
145-
TF_VAR_CODER_TEMPLATE_DIR: ./contents
151+
TF_VAR_CODER_TEMPLATE_DIR: ./coder
146152
TF_VAR_CODER_TEMPLATE_MESSAGE: ${{ steps.message.outputs.pr_title }}
147153
TF_LOG: info

‎.github/workflows/security.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ jobs:
9999
# version in the comments will differ. This is also defined in
100100
# ci.yaml.
101101
set -euxo pipefail
102-
cd dogfood/contents
102+
cd dogfood/coder
103103
mkdir -p /usr/local/bin
104104
mkdir -p /usr/local/include
105105

‎Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@ lint/ts: site/node_modules/.installed
505505
lint/go:
506506
./scripts/check_enterprise_imports.sh
507507
./scripts/check_codersdk_imports.sh
508-
linter_ver=$(shell egrep -o 'GOLANGCI_LINT_VERSION=\S+' dogfood/contents/Dockerfile | cut -d '=' -f 2)
508+
linter_ver=$(shell egrep -o 'GOLANGCI_LINT_VERSION=\S+' dogfood/coder/Dockerfile | cut -d '=' -f 2)
509509
go run github.com/golangci/golangci-lint/cmd/golangci-lint@v$$linter_ver run
510510
.PHONY: lint/go
511511

@@ -963,5 +963,5 @@ else
963963
endif
964964
.PHONY: test-e2e
965965

966-
dogfood/contents/nix.hash: flake.nix flake.lock
967-
sha256sum flake.nix flake.lock >./dogfood/contents/nix.hash
966+
dogfood/coder/nix.hash: flake.nix flake.lock
967+
sha256sum flake.nix flake.lock >./dogfood/coder/nix.hash

‎envbuilder-dogfood/README.md renamed to ‎dogfood/coder-envbuilder/README.md

‎envbuilder-dogfood/main.tf renamed to ‎dogfood/coder-envbuilder/main.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ data "coder_parameter" "devcontainer_repo" {
4343
data "coder_parameter" "devcontainer_dir" {
4444
type = "string"
4545
name = "Devcontainer Directory"
46-
default = "dogfood/contents/"
46+
default = "dogfood/coder/"
4747
description = "Directory containing a devcontainer.json relative to the repository root"
4848
mutable = true
4949
}

‎dogfood/contents/Dockerfile renamed to ‎dogfood/coder/Dockerfile

File renamed without changes.

‎dogfood/contents/Makefile renamed to ‎dogfood/coder/Makefile

File renamed without changes.

‎dogfood/contents/README.md renamed to ‎dogfood/coder/README.md

‎dogfood/contents/devcontainer.json renamed to ‎dogfood/coder/devcontainer.json

File renamed without changes.

‎dogfood/contents/files/etc/apt/apt.conf.d/80-no-recommends renamed to ‎dogfood/coder/files/etc/apt/apt.conf.d/80-no-recommends

File renamed without changes.

‎dogfood/contents/files/etc/apt/apt.conf.d/80-retries renamed to ‎dogfood/coder/files/etc/apt/apt.conf.d/80-retries

File renamed without changes.

‎dogfood/contents/files/etc/apt/preferences.d/containerd renamed to ‎dogfood/coder/files/etc/apt/preferences.d/containerd

File renamed without changes.

‎dogfood/contents/files/etc/apt/preferences.d/docker renamed to ‎dogfood/coder/files/etc/apt/preferences.d/docker

File renamed without changes.

‎dogfood/contents/files/etc/apt/preferences.d/github-cli renamed to ‎dogfood/coder/files/etc/apt/preferences.d/github-cli

File renamed without changes.

‎dogfood/contents/files/etc/apt/preferences.d/google-cloud renamed to ‎dogfood/coder/files/etc/apt/preferences.d/google-cloud

File renamed without changes.

‎dogfood/contents/files/etc/apt/preferences.d/hashicorp renamed to ‎dogfood/coder/files/etc/apt/preferences.d/hashicorp

File renamed without changes.

‎dogfood/contents/files/etc/apt/preferences.d/ppa renamed to ‎dogfood/coder/files/etc/apt/preferences.d/ppa

File renamed without changes.

‎dogfood/contents/files/etc/apt/sources.list.d/docker.list renamed to ‎dogfood/coder/files/etc/apt/sources.list.d/docker.list

File renamed without changes.

‎dogfood/contents/files/etc/apt/sources.list.d/google-cloud.list renamed to ‎dogfood/coder/files/etc/apt/sources.list.d/google-cloud.list

File renamed without changes.

‎dogfood/contents/files/etc/apt/sources.list.d/hashicorp.list renamed to ‎dogfood/coder/files/etc/apt/sources.list.d/hashicorp.list

File renamed without changes.

‎dogfood/contents/files/etc/apt/sources.list.d/postgresql.list renamed to ‎dogfood/coder/files/etc/apt/sources.list.d/postgresql.list

File renamed without changes.

‎dogfood/contents/files/etc/apt/sources.list.d/ppa.list renamed to ‎dogfood/coder/files/etc/apt/sources.list.d/ppa.list

File renamed without changes.

‎dogfood/contents/files/etc/docker/daemon.json renamed to ‎dogfood/coder/files/etc/docker/daemon.json

File renamed without changes.

‎dogfood/contents/files/usr/share/keyrings/ansible.gpg renamed to ‎dogfood/coder/files/usr/share/keyrings/ansible.gpg

File renamed without changes.

‎dogfood/contents/files/usr/share/keyrings/docker.gpg renamed to ‎dogfood/coder/files/usr/share/keyrings/docker.gpg

File renamed without changes.

‎dogfood/contents/files/usr/share/keyrings/fish-shell.gpg renamed to ‎dogfood/coder/files/usr/share/keyrings/fish-shell.gpg

File renamed without changes.

‎dogfood/contents/files/usr/share/keyrings/git-core.gpg renamed to ‎dogfood/coder/files/usr/share/keyrings/git-core.gpg

File renamed without changes.

‎dogfood/contents/files/usr/share/keyrings/github-cli.gpg renamed to ‎dogfood/coder/files/usr/share/keyrings/github-cli.gpg

File renamed without changes.

‎dogfood/contents/files/usr/share/keyrings/google-cloud.gpg renamed to ‎dogfood/coder/files/usr/share/keyrings/google-cloud.gpg

File renamed without changes.

‎dogfood/contents/files/usr/share/keyrings/hashicorp.gpg renamed to ‎dogfood/coder/files/usr/share/keyrings/hashicorp.gpg

File renamed without changes.

‎dogfood/contents/files/usr/share/keyrings/helix.gpg renamed to ‎dogfood/coder/files/usr/share/keyrings/helix.gpg

File renamed without changes.

‎dogfood/contents/files/usr/share/keyrings/neovim.gpg renamed to ‎dogfood/coder/files/usr/share/keyrings/neovim.gpg

File renamed without changes.

‎dogfood/contents/files/usr/share/keyrings/postgresql.gpg renamed to ‎dogfood/coder/files/usr/share/keyrings/postgresql.gpg

File renamed without changes.

‎dogfood/contents/guide.md renamed to ‎dogfood/coder/guide.md

‎dogfood/contents/main.tf renamed to ‎dogfood/coder/main.tf

File renamed without changes.

‎dogfood/contents/nix.hash renamed to ‎dogfood/coder/nix.hash

File renamed without changes.

‎dogfood/contents/update-keys.sh renamed to ‎dogfood/coder/update-keys.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ gpg_flags=(
1515
--yes
1616
)
1717

18-
pushd "$PROJECT_ROOT/dogfood/contents/files/usr/share/keyrings"
18+
pushd "$PROJECT_ROOT/dogfood/coder/files/usr/share/keyrings"
1919

2020
# Ansible PPA signing key
2121
curl "${curl_flags[@]}" "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x6125e2a8c77f2818fb7bd15b93c4a3fd7bb9c367" |

‎dogfood/contents/zed/main.tf renamed to ‎dogfood/coder/zed/main.tf

File renamed without changes.

‎dogfood/main.tf

+48-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ resource "coderd_template" "dogfood" {
3838
display_name = "Write Coder on Coder"
3939
description = "The template to use when developing Coder on Coder!"
4040
icon = "/emojis/1f3c5.png"
41-
organization_id = "703f72a1-76f6-4f89-9de6-8a3989693fe5"
41+
organization_id = data.coderd_organization.default.id
4242
versions = [
4343
{
4444
name = var.CODER_TEMPLATE_VERSION
@@ -73,3 +73,50 @@ resource "coderd_template" "dogfood" {
7373
time_til_dormant_autodelete_ms = 7776000000
7474
time_til_dormant_ms = 8640000000
7575
}
76+
77+
78+
resource "coderd_template" "envbuilder_dogfood" {
79+
name = "coder-envbuilder"
80+
display_name = "Write Coder on Coder using Envbuilder"
81+
description = "Write Coder on Coder using a workspace built by Envbuilder."
82+
icon = "/emojis/1f3d7.png" # 🏗️
83+
organization_id = data.coderd_organization.default.id
84+
versions = [
85+
{
86+
name = var.CODER_TEMPLATE_VERSION
87+
message = var.CODER_TEMPLATE_MESSAGE
88+
directory = "./coder-envbuilder"
89+
active = true
90+
tf_vars = [{
91+
# clusters/dogfood-v2/coder/provisioner/configs/values.yaml#L191-L194
92+
name = "envbuilder_cache_dockerconfigjson_path"
93+
value = "/home/coder/envbuilder-cache-dockerconfig.json"
94+
}]
95+
}
96+
]
97+
acl = {
98+
groups = [{
99+
id = data.coderd_organization.default.id
100+
role = "use"
101+
}]
102+
users = [{
103+
id = data.coderd_user.machine.id
104+
role = "admin"
105+
}]
106+
}
107+
activity_bump_ms = 10800000
108+
allow_user_auto_start = true
109+
allow_user_auto_stop = true
110+
allow_user_cancel_workspace_jobs = false
111+
auto_start_permitted_days_of_week = ["friday", "monday", "saturday", "sunday", "thursday", "tuesday", "wednesday"]
112+
auto_stop_requirement = {
113+
days_of_week = ["sunday"]
114+
weeks = 1
115+
}
116+
default_ttl_ms = 28800000
117+
deprecation_message = null
118+
failure_ttl_ms = 604800000
119+
require_active_version = true
120+
time_til_dormant_autodelete_ms = 7776000000
121+
time_til_dormant_ms = 8640000000
122+
}

‎scripts/update-flake.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ echo "protoc-gen-go version: $PROTOC_GEN_GO_REV"
3737
PROTOC_GEN_GO_SHA256=$(nix-prefetch-git https://github.com/protocolbuffers/protobuf-go --rev "$PROTOC_GEN_GO_REV" | jq -r .hash)
3838
sed -i "s#\(sha256 = \"\)[^\"]*#\1${PROTOC_GEN_GO_SHA256}#" ./flake.nix
3939
40-
make dogfood/contents/nix.hash
40+
make dogfood/coder/nix.hash
4141
4242
echo "Flake updated successfully!"

0 commit comments

Comments
 (0)