diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index f9c5410df0ce2..3212c07c8b306 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -37,7 +37,8 @@ updates: # Update our Dockerfile. - package-ecosystem: "docker" directories: - - "/dogfood/contents" + - "/dogfood/coder" + - "/dogfood/coder-envbuilder" - "/scripts" - "/examples/templates/docker/build" - "/examples/parameters/build" diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e663cc2303986..cb44105012315 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -172,7 +172,7 @@ jobs: - name: Get golangci-lint cache dir run: | - linter_ver=$(egrep -o 'GOLANGCI_LINT_VERSION=\S+' dogfood/contents/Dockerfile | cut -d '=' -f 2) + linter_ver=$(egrep -o 'GOLANGCI_LINT_VERSION=\S+' dogfood/coder/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 index c6b1ce99ebf14..4ad40acb17e69 100644 --- a/.github/workflows/dogfood.yaml +++ b/.github/workflows/dogfood.yaml @@ -68,7 +68,7 @@ jobs: project: b4q6ltmpzh token: ${{ secrets.DEPOT_TOKEN }} buildx-fallback: true - context: "{{defaultContext}}:dogfood/contents" + context: "{{defaultContext}}:dogfood/coder" pull: true save: true push: ${{ github.ref == 'refs/heads/main' }} @@ -113,12 +113,18 @@ jobs: - name: Terraform init and validate run: | - cd dogfood - terraform init -upgrade + pushd dogfood/ + terraform init + terraform validate + popd + pushd dogfood/coder + terraform init terraform validate - cd contents - terraform init -upgrade + popd + pushd dogfood/coder-envbuilder + terraform init terraform validate + popd - name: Get short commit SHA if: github.ref == 'refs/heads/main' @@ -142,6 +148,6 @@ jobs: # Template source & details TF_VAR_CODER_TEMPLATE_NAME: ${{ secrets.CODER_TEMPLATE_NAME }} TF_VAR_CODER_TEMPLATE_VERSION: ${{ steps.vars.outputs.sha_short }} - TF_VAR_CODER_TEMPLATE_DIR: ./contents + TF_VAR_CODER_TEMPLATE_DIR: ./coder TF_VAR_CODER_TEMPLATE_MESSAGE: ${{ steps.message.outputs.pr_title }} TF_LOG: info diff --git a/.github/workflows/security.yaml b/.github/workflows/security.yaml index 7bbabc6572685..03ee574b90040 100644 --- a/.github/workflows/security.yaml +++ b/.github/workflows/security.yaml @@ -99,7 +99,7 @@ jobs: # version in the comments will differ. This is also defined in # ci.yaml. set -euxo pipefail - cd dogfood/contents + cd dogfood/coder mkdir -p /usr/local/bin mkdir -p /usr/local/include diff --git a/Makefile b/Makefile index fbd324974f218..65e85bd23286f 100644 --- a/Makefile +++ b/Makefile @@ -505,7 +505,7 @@ lint/ts: site/node_modules/.installed lint/go: ./scripts/check_enterprise_imports.sh ./scripts/check_codersdk_imports.sh - linter_ver=$(shell egrep -o 'GOLANGCI_LINT_VERSION=\S+' dogfood/contents/Dockerfile | cut -d '=' -f 2) + linter_ver=$(shell egrep -o 'GOLANGCI_LINT_VERSION=\S+' dogfood/coder/Dockerfile | cut -d '=' -f 2) go run github.com/golangci/golangci-lint/cmd/golangci-lint@v$$linter_ver run .PHONY: lint/go @@ -963,5 +963,5 @@ else endif .PHONY: test-e2e -dogfood/contents/nix.hash: flake.nix flake.lock - sha256sum flake.nix flake.lock >./dogfood/contents/nix.hash +dogfood/coder/nix.hash: flake.nix flake.lock + sha256sum flake.nix flake.lock >./dogfood/coder/nix.hash diff --git a/envbuilder-dogfood/README.md b/dogfood/coder-envbuilder/README.md similarity index 100% rename from envbuilder-dogfood/README.md rename to dogfood/coder-envbuilder/README.md diff --git a/envbuilder-dogfood/main.tf b/dogfood/coder-envbuilder/main.tf similarity index 99% rename from envbuilder-dogfood/main.tf rename to dogfood/coder-envbuilder/main.tf index 1d4771ff0c48f..7d13c9887d26b 100644 --- a/envbuilder-dogfood/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/contents/" + default = "dogfood/coder/" description = "Directory containing a devcontainer.json relative to the repository root" mutable = true } diff --git a/dogfood/contents/Dockerfile b/dogfood/coder/Dockerfile similarity index 100% rename from dogfood/contents/Dockerfile rename to dogfood/coder/Dockerfile diff --git a/dogfood/contents/Makefile b/dogfood/coder/Makefile similarity index 100% rename from dogfood/contents/Makefile rename to dogfood/coder/Makefile diff --git a/dogfood/contents/README.md b/dogfood/coder/README.md similarity index 100% rename from dogfood/contents/README.md rename to dogfood/coder/README.md diff --git a/dogfood/contents/devcontainer.json b/dogfood/coder/devcontainer.json similarity index 100% rename from dogfood/contents/devcontainer.json rename to dogfood/coder/devcontainer.json diff --git a/dogfood/contents/files/etc/apt/apt.conf.d/80-no-recommends b/dogfood/coder/files/etc/apt/apt.conf.d/80-no-recommends similarity index 100% rename from dogfood/contents/files/etc/apt/apt.conf.d/80-no-recommends rename to dogfood/coder/files/etc/apt/apt.conf.d/80-no-recommends diff --git a/dogfood/contents/files/etc/apt/apt.conf.d/80-retries b/dogfood/coder/files/etc/apt/apt.conf.d/80-retries similarity index 100% rename from dogfood/contents/files/etc/apt/apt.conf.d/80-retries rename to dogfood/coder/files/etc/apt/apt.conf.d/80-retries diff --git a/dogfood/contents/files/etc/apt/preferences.d/containerd b/dogfood/coder/files/etc/apt/preferences.d/containerd similarity index 100% rename from dogfood/contents/files/etc/apt/preferences.d/containerd rename to dogfood/coder/files/etc/apt/preferences.d/containerd diff --git a/dogfood/contents/files/etc/apt/preferences.d/docker b/dogfood/coder/files/etc/apt/preferences.d/docker similarity index 100% rename from dogfood/contents/files/etc/apt/preferences.d/docker rename to dogfood/coder/files/etc/apt/preferences.d/docker diff --git a/dogfood/contents/files/etc/apt/preferences.d/github-cli b/dogfood/coder/files/etc/apt/preferences.d/github-cli similarity index 100% rename from dogfood/contents/files/etc/apt/preferences.d/github-cli rename to dogfood/coder/files/etc/apt/preferences.d/github-cli diff --git a/dogfood/contents/files/etc/apt/preferences.d/google-cloud b/dogfood/coder/files/etc/apt/preferences.d/google-cloud similarity index 100% rename from dogfood/contents/files/etc/apt/preferences.d/google-cloud rename to dogfood/coder/files/etc/apt/preferences.d/google-cloud diff --git a/dogfood/contents/files/etc/apt/preferences.d/hashicorp b/dogfood/coder/files/etc/apt/preferences.d/hashicorp similarity index 100% rename from dogfood/contents/files/etc/apt/preferences.d/hashicorp rename to dogfood/coder/files/etc/apt/preferences.d/hashicorp diff --git a/dogfood/contents/files/etc/apt/preferences.d/ppa b/dogfood/coder/files/etc/apt/preferences.d/ppa similarity index 100% rename from dogfood/contents/files/etc/apt/preferences.d/ppa rename to dogfood/coder/files/etc/apt/preferences.d/ppa diff --git a/dogfood/contents/files/etc/apt/sources.list.d/docker.list b/dogfood/coder/files/etc/apt/sources.list.d/docker.list similarity index 100% rename from dogfood/contents/files/etc/apt/sources.list.d/docker.list rename to dogfood/coder/files/etc/apt/sources.list.d/docker.list diff --git a/dogfood/contents/files/etc/apt/sources.list.d/google-cloud.list b/dogfood/coder/files/etc/apt/sources.list.d/google-cloud.list similarity index 100% rename from dogfood/contents/files/etc/apt/sources.list.d/google-cloud.list rename to dogfood/coder/files/etc/apt/sources.list.d/google-cloud.list diff --git a/dogfood/contents/files/etc/apt/sources.list.d/hashicorp.list b/dogfood/coder/files/etc/apt/sources.list.d/hashicorp.list similarity index 100% rename from dogfood/contents/files/etc/apt/sources.list.d/hashicorp.list rename to dogfood/coder/files/etc/apt/sources.list.d/hashicorp.list diff --git a/dogfood/contents/files/etc/apt/sources.list.d/postgresql.list b/dogfood/coder/files/etc/apt/sources.list.d/postgresql.list similarity index 100% rename from dogfood/contents/files/etc/apt/sources.list.d/postgresql.list rename to dogfood/coder/files/etc/apt/sources.list.d/postgresql.list diff --git a/dogfood/contents/files/etc/apt/sources.list.d/ppa.list b/dogfood/coder/files/etc/apt/sources.list.d/ppa.list similarity index 100% rename from dogfood/contents/files/etc/apt/sources.list.d/ppa.list rename to dogfood/coder/files/etc/apt/sources.list.d/ppa.list diff --git a/dogfood/contents/files/etc/docker/daemon.json b/dogfood/coder/files/etc/docker/daemon.json similarity index 100% rename from dogfood/contents/files/etc/docker/daemon.json rename to dogfood/coder/files/etc/docker/daemon.json diff --git a/dogfood/contents/files/usr/share/keyrings/ansible.gpg b/dogfood/coder/files/usr/share/keyrings/ansible.gpg similarity index 100% rename from dogfood/contents/files/usr/share/keyrings/ansible.gpg rename to dogfood/coder/files/usr/share/keyrings/ansible.gpg diff --git a/dogfood/contents/files/usr/share/keyrings/docker.gpg b/dogfood/coder/files/usr/share/keyrings/docker.gpg similarity index 100% rename from dogfood/contents/files/usr/share/keyrings/docker.gpg rename to dogfood/coder/files/usr/share/keyrings/docker.gpg diff --git a/dogfood/contents/files/usr/share/keyrings/fish-shell.gpg b/dogfood/coder/files/usr/share/keyrings/fish-shell.gpg similarity index 100% rename from dogfood/contents/files/usr/share/keyrings/fish-shell.gpg rename to dogfood/coder/files/usr/share/keyrings/fish-shell.gpg diff --git a/dogfood/contents/files/usr/share/keyrings/git-core.gpg b/dogfood/coder/files/usr/share/keyrings/git-core.gpg similarity index 100% rename from dogfood/contents/files/usr/share/keyrings/git-core.gpg rename to dogfood/coder/files/usr/share/keyrings/git-core.gpg diff --git a/dogfood/contents/files/usr/share/keyrings/github-cli.gpg b/dogfood/coder/files/usr/share/keyrings/github-cli.gpg similarity index 100% rename from dogfood/contents/files/usr/share/keyrings/github-cli.gpg rename to dogfood/coder/files/usr/share/keyrings/github-cli.gpg diff --git a/dogfood/contents/files/usr/share/keyrings/google-cloud.gpg b/dogfood/coder/files/usr/share/keyrings/google-cloud.gpg similarity index 100% rename from dogfood/contents/files/usr/share/keyrings/google-cloud.gpg rename to dogfood/coder/files/usr/share/keyrings/google-cloud.gpg diff --git a/dogfood/contents/files/usr/share/keyrings/hashicorp.gpg b/dogfood/coder/files/usr/share/keyrings/hashicorp.gpg similarity index 100% rename from dogfood/contents/files/usr/share/keyrings/hashicorp.gpg rename to dogfood/coder/files/usr/share/keyrings/hashicorp.gpg diff --git a/dogfood/contents/files/usr/share/keyrings/helix.gpg b/dogfood/coder/files/usr/share/keyrings/helix.gpg similarity index 100% rename from dogfood/contents/files/usr/share/keyrings/helix.gpg rename to dogfood/coder/files/usr/share/keyrings/helix.gpg diff --git a/dogfood/contents/files/usr/share/keyrings/neovim.gpg b/dogfood/coder/files/usr/share/keyrings/neovim.gpg similarity index 100% rename from dogfood/contents/files/usr/share/keyrings/neovim.gpg rename to dogfood/coder/files/usr/share/keyrings/neovim.gpg diff --git a/dogfood/contents/files/usr/share/keyrings/postgresql.gpg b/dogfood/coder/files/usr/share/keyrings/postgresql.gpg similarity index 100% rename from dogfood/contents/files/usr/share/keyrings/postgresql.gpg rename to dogfood/coder/files/usr/share/keyrings/postgresql.gpg diff --git a/dogfood/contents/guide.md b/dogfood/coder/guide.md similarity index 100% rename from dogfood/contents/guide.md rename to dogfood/coder/guide.md diff --git a/dogfood/contents/main.tf b/dogfood/coder/main.tf similarity index 100% rename from dogfood/contents/main.tf rename to dogfood/coder/main.tf diff --git a/dogfood/contents/nix.hash b/dogfood/coder/nix.hash similarity index 100% rename from dogfood/contents/nix.hash rename to dogfood/coder/nix.hash diff --git a/dogfood/contents/update-keys.sh b/dogfood/coder/update-keys.sh similarity index 97% rename from dogfood/contents/update-keys.sh rename to dogfood/coder/update-keys.sh index 1b57d015bff1d..10b2660b5f58b 100755 --- a/dogfood/contents/update-keys.sh +++ b/dogfood/coder/update-keys.sh @@ -15,7 +15,7 @@ gpg_flags=( --yes ) -pushd "$PROJECT_ROOT/dogfood/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" | diff --git a/dogfood/contents/zed/main.tf b/dogfood/coder/zed/main.tf similarity index 100% rename from dogfood/contents/zed/main.tf rename to dogfood/coder/zed/main.tf diff --git a/dogfood/main.tf b/dogfood/main.tf index 309e5f5d3d1d4..72cd868f61645 100644 --- a/dogfood/main.tf +++ b/dogfood/main.tf @@ -38,7 +38,7 @@ resource "coderd_template" "dogfood" { display_name = "Write Coder on Coder" description = "The template to use when developing Coder on Coder!" icon = "/emojis/1f3c5.png" - organization_id = "703f72a1-76f6-4f89-9de6-8a3989693fe5" + organization_id = data.coderd_organization.default.id versions = [ { name = var.CODER_TEMPLATE_VERSION @@ -73,3 +73,50 @@ resource "coderd_template" "dogfood" { 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 = data.coderd_organization.default.id + versions = [ + { + name = var.CODER_TEMPLATE_VERSION + message = var.CODER_TEMPLATE_MESSAGE + directory = "./coder-envbuilder" + 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 = { + 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 +} diff --git a/scripts/update-flake.sh b/scripts/update-flake.sh index c951109e6c26b..7007b6b001a5d 100755 --- a/scripts/update-flake.sh +++ b/scripts/update-flake.sh @@ -37,6 +37,6 @@ echo "protoc-gen-go version: $PROTOC_GEN_GO_REV" PROTOC_GEN_GO_SHA256=$(nix-prefetch-git https://github.com/protocolbuffers/protobuf-go --rev "$PROTOC_GEN_GO_REV" | jq -r .hash) sed -i "s#\(sha256 = \"\)[^\"]*#\1${PROTOC_GEN_GO_SHA256}#" ./flake.nix -make dogfood/contents/nix.hash +make dogfood/coder/nix.hash echo "Flake updated successfully!" pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy