NotificationsYou must be signed in to change notification settings
Fork927
Star10.1k

Commit979430d

authored

chore: manage dogfood template using coderd provider (#14321)

1 parent7142cbb commit979430dCopy full SHA for 979430d

File tree

36 files changed

+444

-369

lines changed

.github/workflows
- ci.yaml
- dogfood.yaml
Makefile
dogfood
- contents
  - Dockerfile
  - Dockerfile.nix
  - Makefile
  - README.md
  - devcontainer.json
  - files
    - etc
      - apt
        apt.conf.d
        80-no-recommends
        80-retries
        preferences.d
        docker
        github-cli
        google-cloud
        hashicorp
        ppa
        sources.list.d
        docker.list
        google-cloud.list
        hashicorp.list
        postgresql.list
        ppa.list
      - docker
        daemon.json
    - usr/share/keyrings
  - guide.md
  - main.tf
  - update-keys.sh
- main.tf
envbuilder-dogfood
- main.tf

36 files changed

+444

-369

lines changed

`‎.github/workflows/ci.yaml`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ jobs:`
`168`	`168`
`169`	`169`	`-name:Get golangci-lint cache dir`
`170`	`170`	`run:\|`
`171`		`- linter_ver=$(egrep -o 'GOLANGCI_LINT_VERSION=\S+' dogfood/Dockerfile \| cut -d '=' -f 2)`
	`171`	`+ linter_ver=$(egrep -o 'GOLANGCI_LINT_VERSION=\S+' dogfood/contents/Dockerfile \| cut -d '=' -f 2)`
`172`	`172`	`go install github.com/golangci/golangci-lint/cmd/golangci-lint@v$linter_ver`
`173`	`173`	`dir=$(golangci-lint cache status \| awk '/Dir/ { print $2 }')`
`174`	`174`	`echo "LINT_CACHE_DIR=$dir" >> $GITHUB_ENV`

`‎.github/workflows/dogfood.yaml`

Lines changed: 10 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ jobs:`
`56`	`56`	`project:b4q6ltmpzh`
`57`	`57`	`token:${{ secrets.DEPOT_TOKEN }}`
`58`	`58`	`buildx-fallback:true`
`59`		`-context:"{{defaultContext}}:dogfood"`
	`59`	`+context:"{{defaultContext}}:dogfood/contents"`
`60`	`60`	`pull:true`
`61`	`61`	`save:true`
`62`	`62`	`push:${{ github.ref == 'refs/heads/main' }}`
`@@ -69,7 +69,7 @@ jobs:`
`69`	`69`	`token:${{ secrets.DEPOT_TOKEN }}`
`70`	`70`	`buildx-fallback:true`
`71`	`71`	`context:"."`
`72`		`-file:"dogfood/Dockerfile.nix"`
	`72`	`+file:"dogfood/contents/Dockerfile.nix"`
`73`	`73`	`pull:true`
`74`	`74`	`save:true`
`75`	`75`	`push:${{ github.ref == 'refs/heads/main' }}`
`@@ -90,6 +90,9 @@ jobs:`
`90`	`90`	`cd dogfood`
`91`	`91`	`terraform init -upgrade`
`92`	`92`	`terraform validate`
	`93`	`+ cd contents`
	`94`	`+ terraform init -upgrade`
	`95`	`+ terraform validate`
`93`	`96`
`94`	`97`	`-name:Get short commit SHA`
`95`	`98`	`if:github.ref == 'refs/heads/main'`
`@@ -101,22 +104,16 @@ jobs:`
`101`	`104`	`id:message`
`102`	`105`	`run:echo "pr_title=$(git log --format=%s -n 1 ${{ github.sha }})" >> $GITHUB_OUTPUT`
`103`	`106`
`104`		`- -name:"Get latest Coder binary from the server"`
`105`		`-if:github.ref == 'refs/heads/main'`
`106`		`-run:\|`
`107`		`- curl -fsSL "https://dev.coder.com/bin/coder-linux-amd64" -o "./coder"`
`108`		`- chmod +x "./coder"`
`109`		`-`
`110`	`107`	`-name:"Push template"`
`111`	`108`	`if:github.ref == 'refs/heads/main'`
`112`	`109`	`run:\|`
`113`		`-./coder templates push $CODER_TEMPLATE_NAME --directory $CODER_TEMPLATE_DIR --yes --name=$CODER_TEMPLATE_VERSION --message="$CODER_TEMPLATE_MESSAGE"`
	`110`	`+terraform apply -auto-approve`
`114`	`111`	`env:`
`115`	`112`	`# Consumed by Coder CLI`
`116`	`113`	`CODER_URL:https://dev.coder.com`
`117`	`114`	`CODER_SESSION_TOKEN:${{ secrets.CODER_SESSION_TOKEN }}`
`118`	`115`	`# Template source & details`
`119`		`-CODER_TEMPLATE_NAME:${{ secrets.CODER_TEMPLATE_NAME }}`
`120`		`-CODER_TEMPLATE_VERSION:${{ steps.vars.outputs.sha_short }}`
`121`		`-CODER_TEMPLATE_DIR:./dogfood`
`122`		`-CODER_TEMPLATE_MESSAGE:${{ steps.message.outputs.pr_title }}`
	`116`	`+TF_VAR_CODER_TEMPLATE_NAME:${{ secrets.CODER_TEMPLATE_NAME }}`
	`117`	`+TF_VAR_CODER_TEMPLATE_VERSION:${{ steps.vars.outputs.sha_short }}`
	`118`	`+TF_VAR_CODER_TEMPLATE_DIR:./dogfood/contents`
	`119`	`+TF_VAR_CODER_TEMPLATE_MESSAGE:${{ steps.message.outputs.pr_title }}`

`‎Makefile`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -451,7 +451,7 @@ lint/ts:`
`451`	`451`
`452`	`452`	`lint/go:`
`453`	`453`	`./scripts/check_enterprise_imports.sh`
`454`		`-linter_ver=$(shell egrep -o 'GOLANGCI_LINT_VERSION=\S+' dogfood/Dockerfile \| cut -d '=' -f 2)`
	`454`	`+linter_ver=$(shell egrep -o 'GOLANGCI_LINT_VERSION=\S+' dogfood/contents/Dockerfile \| cut -d '=' -f 2)`
`455`	`455`	`go run github.com/golangci/golangci-lint/cmd/golangci-lint@v$$linter_ver run`
`456`	`456`	`.PHONY: lint/go`
`457`	`457`