coder · ethanndickson · Aug 16, 2024 · Aug 14, 2024
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -168,7 +168,7 @@ jobs:
 
       - name: Get golangci-lint cache dir
         run: |
-          linter_ver=$(egrep -o 'GOLANGCI_LINT_VERSION=\S+' dogfood/Dockerfile | cut -d '=' -f 2)
+          linter_ver=$(egrep -o 'GOLANGCI_LINT_VERSION=\S+' dogfood/contents/Dockerfile | cut -d '=' -f 2)
           go install github.com/golangci/golangci-lint/cmd/golangci-lint@v$linter_ver
           dir=$(golangci-lint cache status | awk '/Dir/ { print $2 }')
           echo "LINT_CACHE_DIR=$dir" >> $GITHUB_ENV

diff --git a/.github/workflows/dogfood.yaml b/.github/workflows/dogfood.yaml
@@ -56,7 +56,7 @@ jobs:
           project: b4q6ltmpzh
           token: ${{ secrets.DEPOT_TOKEN }}
           buildx-fallback: true
-          context: "{{defaultContext}}:dogfood"
+          context: "{{defaultContext}}:dogfood/contents"
           pull: true
           save: true
           push: ${{ github.ref == 'refs/heads/main' }}
@@ -69,7 +69,7 @@ jobs:
           token: ${{ secrets.DEPOT_TOKEN }}
           buildx-fallback: true
           context: "."
-          file: "dogfood/Dockerfile.nix"
+          file: "dogfood/contents/Dockerfile.nix"
           pull: true
           save: true
           push: ${{ github.ref == 'refs/heads/main' }}
@@ -90,6 +90,9 @@ jobs:
           cd dogfood
           terraform init -upgrade
           terraform validate
+          cd contents
+          terraform init -upgrade
+          terraform validate
 
       - name: Get short commit SHA
         if: github.ref == 'refs/heads/main'
@@ -101,22 +104,16 @@ jobs:
         id: message
         run: echo "pr_title=$(git log --format=%s -n 1 ${{ github.sha }})" >> $GITHUB_OUTPUT
 
-      - name: "Get latest Coder binary from the server"
-        if: github.ref == 'refs/heads/main'
-        run: |
-          curl -fsSL "https://dev.coder.com/bin/coder-linux-amd64" -o "./coder"
-          chmod +x "./coder"
-
       - name: "Push template"
         if: github.ref == 'refs/heads/main'
         run: |
-          ./coder templates push $CODER_TEMPLATE_NAME --directory $CODER_TEMPLATE_DIR --yes --name=$CODER_TEMPLATE_VERSION --message="$CODER_TEMPLATE_MESSAGE"
+          terraform apply -auto-approve
         env:
           # Consumed by Coder CLI
           CODER_URL: https://dev.coder.com
           CODER_SESSION_TOKEN: ${{ secrets.CODER_SESSION_TOKEN }}
           # Template source & details
-          CODER_TEMPLATE_NAME: ${{ secrets.CODER_TEMPLATE_NAME }}
-          CODER_TEMPLATE_VERSION: ${{ steps.vars.outputs.sha_short }}
-          CODER_TEMPLATE_DIR: ./dogfood
-          CODER_TEMPLATE_MESSAGE: ${{ steps.message.outputs.pr_title }}
+          TF_VAR_CODER_TEMPLATE_NAME: ${{ secrets.CODER_TEMPLATE_NAME }}
+          TF_VAR_CODER_TEMPLATE_VERSION: ${{ steps.vars.outputs.sha_short }}
+          TF_VAR_CODER_TEMPLATE_DIR: ./dogfood/contents
+          TF_VAR_CODER_TEMPLATE_MESSAGE: ${{ steps.message.outputs.pr_title }}
diff --git a/Makefile b/Makefile
@@ -451,7 +451,7 @@ lint/ts:
 
 lint/go:
 	./scripts/check_enterprise_imports.sh
-	linter_ver=$(shell egrep -o 'GOLANGCI_LINT_VERSION=\S+' dogfood/Dockerfile | cut -d '=' -f 2)
+	linter_ver=$(shell egrep -o 'GOLANGCI_LINT_VERSION=\S+' dogfood/contents/Dockerfile | cut -d '=' -f 2)
 	go run github.com/golangci/golangci-lint/cmd/golangci-lint@v$$linter_ver run
 .PHONY: lint/go
 

diff --git a/dogfood/Dockerfile → dogfood/contents/Dockerfile b/dogfood/Dockerfile → dogfood/contents/Dockerfile
diff --git a/dogfood/Dockerfile.nix → dogfood/contents/Dockerfile.nix b/dogfood/Dockerfile.nix → dogfood/contents/Dockerfile.nix
diff --git a/dogfood/Makefile → dogfood/contents/Makefile b/dogfood/Makefile → dogfood/contents/Makefile
diff --git a/dogfood/README.md → dogfood/contents/README.md b/dogfood/README.md → dogfood/contents/README.md
diff --git a/dogfood/devcontainer.json → dogfood/contents/devcontainer.json b/dogfood/devcontainer.json → dogfood/contents/devcontainer.json
diff --git a/...files/etc/apt/apt.conf.d/80-no-recommends → ...files/etc/apt/apt.conf.d/80-no-recommends b/...files/etc/apt/apt.conf.d/80-no-recommends → ...files/etc/apt/apt.conf.d/80-no-recommends
diff --git a/dogfood/files/etc/apt/apt.conf.d/80-retries → ...tents/files/etc/apt/apt.conf.d/80-retries b/dogfood/files/etc/apt/apt.conf.d/80-retries → ...tents/files/etc/apt/apt.conf.d/80-retries
diff --git a/dogfood/files/etc/apt/preferences.d/docker → ...ntents/files/etc/apt/preferences.d/docker b/dogfood/files/etc/apt/preferences.d/docker → ...ntents/files/etc/apt/preferences.d/docker
diff --git a/...od/files/etc/apt/preferences.d/github-cli → ...ts/files/etc/apt/preferences.d/github-cli b/...od/files/etc/apt/preferences.d/github-cli → ...ts/files/etc/apt/preferences.d/github-cli
diff --git a/.../files/etc/apt/preferences.d/google-cloud → .../files/etc/apt/preferences.d/google-cloud b/.../files/etc/apt/preferences.d/google-cloud → .../files/etc/apt/preferences.d/google-cloud
diff --git a/...ood/files/etc/apt/preferences.d/hashicorp → ...nts/files/etc/apt/preferences.d/hashicorp b/...ood/files/etc/apt/preferences.d/hashicorp → ...nts/files/etc/apt/preferences.d/hashicorp
diff --git a/dogfood/files/etc/apt/preferences.d/ppa → .../contents/files/etc/apt/preferences.d/ppa b/dogfood/files/etc/apt/preferences.d/ppa → .../contents/files/etc/apt/preferences.d/ppa
diff --git a/.../files/etc/apt/sources.list.d/docker.list → .../files/etc/apt/sources.list.d/docker.list b/.../files/etc/apt/sources.list.d/docker.list → .../files/etc/apt/sources.list.d/docker.list
diff --git a/.../etc/apt/sources.list.d/google-cloud.list → .../etc/apt/sources.list.d/google-cloud.list b/.../etc/apt/sources.list.d/google-cloud.list → .../etc/apt/sources.list.d/google-cloud.list
diff --git a/...les/etc/apt/sources.list.d/hashicorp.list → ...les/etc/apt/sources.list.d/hashicorp.list b/...les/etc/apt/sources.list.d/hashicorp.list → ...les/etc/apt/sources.list.d/hashicorp.list
diff --git a/...es/etc/apt/sources.list.d/postgresql.list → ...es/etc/apt/sources.list.d/postgresql.list b/...es/etc/apt/sources.list.d/postgresql.list → ...es/etc/apt/sources.list.d/postgresql.list
diff --git a/...ood/files/etc/apt/sources.list.d/ppa.list → ...nts/files/etc/apt/sources.list.d/ppa.list b/...ood/files/etc/apt/sources.list.d/ppa.list → ...nts/files/etc/apt/sources.list.d/ppa.list
diff --git a/dogfood/files/etc/docker/daemon.json → ...ood/contents/files/etc/docker/daemon.json b/dogfood/files/etc/docker/daemon.json → ...ood/contents/files/etc/docker/daemon.json
diff --git a/dogfood/files/usr/share/keyrings/ansible.gpg → ...ents/files/usr/share/keyrings/ansible.gpg b/dogfood/files/usr/share/keyrings/ansible.gpg → ...ents/files/usr/share/keyrings/ansible.gpg
diff --git a/dogfood/files/usr/share/keyrings/docker.gpg → ...tents/files/usr/share/keyrings/docker.gpg b/dogfood/files/usr/share/keyrings/docker.gpg → ...tents/files/usr/share/keyrings/docker.gpg
diff --git a/...d/files/usr/share/keyrings/fish-shell.gpg → ...s/files/usr/share/keyrings/fish-shell.gpg b/...d/files/usr/share/keyrings/fish-shell.gpg → ...s/files/usr/share/keyrings/fish-shell.gpg
diff --git a/...ood/files/usr/share/keyrings/git-core.gpg → ...nts/files/usr/share/keyrings/git-core.gpg b/...ood/files/usr/share/keyrings/git-core.gpg → ...nts/files/usr/share/keyrings/git-core.gpg
diff --git a/...d/files/usr/share/keyrings/github-cli.gpg → ...s/files/usr/share/keyrings/github-cli.gpg b/...d/files/usr/share/keyrings/github-cli.gpg → ...s/files/usr/share/keyrings/github-cli.gpg
diff --git a/...files/usr/share/keyrings/google-cloud.gpg → ...files/usr/share/keyrings/google-cloud.gpg b/...files/usr/share/keyrings/google-cloud.gpg → ...files/usr/share/keyrings/google-cloud.gpg
diff --git a/...od/files/usr/share/keyrings/hashicorp.gpg → ...ts/files/usr/share/keyrings/hashicorp.gpg b/...od/files/usr/share/keyrings/hashicorp.gpg → ...ts/files/usr/share/keyrings/hashicorp.gpg
diff --git a/dogfood/files/usr/share/keyrings/helix.gpg → ...ntents/files/usr/share/keyrings/helix.gpg b/dogfood/files/usr/share/keyrings/helix.gpg → ...ntents/files/usr/share/keyrings/helix.gpg
diff --git a/dogfood/files/usr/share/keyrings/neovim.gpg → ...tents/files/usr/share/keyrings/neovim.gpg b/dogfood/files/usr/share/keyrings/neovim.gpg → ...tents/files/usr/share/keyrings/neovim.gpg
diff --git a/...d/files/usr/share/keyrings/postgresql.gpg → ...s/files/usr/share/keyrings/postgresql.gpg b/...d/files/usr/share/keyrings/postgresql.gpg → ...s/files/usr/share/keyrings/postgresql.gpg
diff --git a/dogfood/guide.md → dogfood/contents/guide.md b/dogfood/guide.md → dogfood/contents/guide.md