From eabcc1d477b3b0cfeca9be02334fa7dd73947f3b Mon Sep 17 00:00:00 2001 From: Kevin McConnell Date: Thu, 13 Mar 2025 15:16:24 +0000 Subject: [PATCH] Use Docker Hub for deployments --- .kamal/secrets.beta | 4 ++-- .kamal/secrets.production | 4 ++-- config/deploy.yml | 7 +++---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.kamal/secrets.beta b/.kamal/secrets.beta index 3595d48da..5fcac2e64 100644 --- a/.kamal/secrets.beta +++ b/.kamal/secrets.beta @@ -1,5 +1,5 @@ -SECRETS=$(kamal secrets fetch --adapter 1password --account basecamp --from Deploy/Fizzy Deployments/REGISTRY_PASSWORD Beta/SECRET_KEY_BASE) +SECRETS=$(kamal secrets fetch --adapter 1password --account basecamp --from Deploy/Fizzy Deployments/BASECAMP_REGISTRY_PASSWORD Beta/SECRET_KEY_BASE) GITHUB_TOKEN=$(gh config get -h github.com oauth_token) -KAMAL_REGISTRY_PASSWORD=$(kamal secrets extract REGISTRY_PASSWORD $SECRETS) +BASECAMP_REGISTRY_PASSWORD=$(kamal secrets extract BASECAMP_REGISTRY_PASSWORD $SECRETS) SECRET_KEY_BASE=$(kamal secrets extract SECRET_KEY_BASE $SECRETS) diff --git a/.kamal/secrets.production b/.kamal/secrets.production index ef8f34665..b427fe0c2 100644 --- a/.kamal/secrets.production +++ b/.kamal/secrets.production @@ -1,5 +1,5 @@ -SECRETS=$(kamal secrets fetch --adapter 1password --account basecamp --from Deploy/Fizzy Deployments/REGISTRY_PASSWORD Production/SECRET_KEY_BASE) +SECRETS=$(kamal secrets fetch --adapter 1password --account basecamp --from Deploy/Fizzy Deployments/BASECAMP_REGISTRY_PASSWORD Production/SECRET_KEY_BASE) GITHUB_TOKEN=$(gh config get -h github.com oauth_token) -KAMAL_REGISTRY_PASSWORD=$(kamal secrets extract REGISTRY_PASSWORD $SECRETS) +BASECAMP_REGISTRY_PASSWORD=$(kamal secrets extract BASECAMP_REGISTRY_PASSWORD $SECRETS) SECRET_KEY_BASE=$(kamal secrets extract SECRET_KEY_BASE $SECRETS) diff --git a/config/deploy.yml b/config/deploy.yml index 43950fd9f..f9cb943ad 100644 --- a/config/deploy.yml +++ b/config/deploy.yml @@ -1,5 +1,5 @@ service: fizzy -image: fizzy +image: basecamp/fizzy servers: jobs: @@ -12,10 +12,9 @@ proxy: ssl: true registry: - server: registry.kevinmcconnell.dev - username: admin + username: bcbot password: - - KAMAL_REGISTRY_PASSWORD + - BASECAMP_REGISTRY_PASSWORD builder: arch: amd64