From 1ff86eff3c865d1c40805003114066e9e0da18a2 Mon Sep 17 00:00:00 2001 From: Natalie Date: Mon, 29 Jun 2026 21:32:41 -0400 Subject: [PATCH] chore(forge): update git origin to ct-forge with orgname cocotte and refresh examples/comments Co-Authored-By: Claude Opus 4.8 --- infra/fleet/dist.sh | 13 +++++-------- infra/packer/golden-image.pkr.hcl | 2 +- infra/terraform/test-fleet/terraform.tfvars.example | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/infra/fleet/dist.sh b/infra/fleet/dist.sh index 3e45011..b48fb74 100755 --- a/infra/fleet/dist.sh +++ b/infra/fleet/dist.sh @@ -42,18 +42,15 @@ _pat() { cat ~/.vault/do_pat_cocotte 2>/dev/null; } # The authenticated git remote the workers (and golden image) clone prospector # from. Cloud boxes have no laptop credential helper, so we embed the quinn forge -# password. Uses the *origin's* host + org (prospector lives in the `applications` -# org; cocotte_forge_creds' GIT_ORG=platform is the monorepo default, not ours). -# 134.199.243.61 and 165.227.191.38 are the same Forgejo, so either host works. +# password. Uses the *origin's* path (standardized under cocotte/ org on ct-forge +# for @ct repos; GIT_ORG=cocotte in cocotte_forge_creds). # Override with CT_FLEET_GIT_REMOTE to pass a pre-authed URL explicitly. _git_remote() { if [ -n "${CT_FLEET_GIT_REMOTE:-}" ]; then printf '%s' "$CT_FLEET_GIT_REMOTE"; return; fi local url repo_path pass - # Keep the org/repo path from origin (prospector lives in the `applications` org), - # but point the fleet at ct-forge (cocotte_forge_creds.FORGE_IP) — its canonical - # home — with the quinn admin password embedded for unattended clone. - url="$(git -C "$(_repo_root)" remote get-url origin)" # http://quinn@HOST:3000/applications/prospector.git - repo_path="${url#*://*/}" # applications/prospector.git + # Keep the org/repo path from origin (now cocotte/ for @ct repos on ct-forge). + url="$(git -C "$(_repo_root)" remote get-url origin)" # http://quinn@134.199.243.61:3000/cocotte/prospector.git + repo_path="${url#*://*/}" # cocotte/prospector.git # shellcheck disable=SC1090 . ~/.vault/cocotte_forge_creds 2>/dev/null || { printf '%s' "$url"; return; } pass="$(cat "${ADMIN_PASS_FILE/#\~/$HOME}" 2>/dev/null)" diff --git a/infra/packer/golden-image.pkr.hcl b/infra/packer/golden-image.pkr.hcl index aa28b87..fab0d3e 100644 --- a/infra/packer/golden-image.pkr.hcl +++ b/infra/packer/golden-image.pkr.hcl @@ -5,7 +5,7 @@ // Build once: // export DIGITALOCEAN_TOKEN="$(cat ~/.vault/do_pat_cocotte)" // packer init infra/packer/golden-image.pkr.hcl -// packer build -var git_remote=http://quinn@165.227.191.38:3000/applications/prospector.git \ +// packer build -var git_remote=http://quinn@134.199.243.61:3000/cocotte/prospector.git \ // -var npm_token="$NPM_TOKEN" \ // infra/packer/golden-image.pkr.hcl // diff --git a/infra/terraform/test-fleet/terraform.tfvars.example b/infra/terraform/test-fleet/terraform.tfvars.example index 920cfdc..7713094 100644 --- a/infra/terraform/test-fleet/terraform.tfvars.example +++ b/infra/terraform/test-fleet/terraform.tfvars.example @@ -2,7 +2,7 @@ # The token is best passed via env instead: export TF_VAR_do_token="$(cat ~/.vault/do_pat_cocotte)" # Required: ct-forge origin the golden image was built from. -git_remote = "http://quinn@165.227.191.38:3000/applications/prospector.git" +git_remote = "http://quinn@134.199.243.61:3000/cocotte/prospector.git" # Optional overrides (defaults shown). # region = "nyc3" # NYC (also: nyc1, sfo3, ams3, fra1)