From 8a9c0ba67f63705f06aea801205ac4fd9878f0fd Mon Sep 17 00:00:00 2001 From: Graham McIntire Date: Tue, 5 May 2026 10:29:26 -0500 Subject: [PATCH] chore(ci): move prop and prop-grid-rs images to codeberg Both build workflows now push to codeberg.org/gmcintire/ alongside the runtime base. Login URL is the hardcoded env.REGISTRY rather than secrets.REGISTRY_URL so a stale/wrong URL secret can't silently push to the wrong registry. k8s deployment manifests still reference git.mcintire.me images and need a follow-up bump to codeberg-side tags after the next CI build lands an image at codeberg.org. --- .forgejo/workflows/build-grid-rs.yaml | 7 ++++--- .forgejo/workflows/build.yaml | 10 +++++++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.forgejo/workflows/build-grid-rs.yaml b/.forgejo/workflows/build-grid-rs.yaml index 5812d876..a37c9a48 100644 --- a/.forgejo/workflows/build-grid-rs.yaml +++ b/.forgejo/workflows/build-grid-rs.yaml @@ -10,9 +10,10 @@ on: - 'rust/prop_grid_rs/**' - '.forgejo/workflows/build-grid-rs.yaml' +# Hosted on Codeberg's container registry. Same setup as build.yaml. env: - REGISTRY: git.mcintire.me - IMAGE_NAME: graham/prop-grid-rs + REGISTRY: codeberg.org + IMAGE_NAME: gmcintire/prop-grid-rs concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -90,7 +91,7 @@ jobs: max_attempts=3 while : ; do if echo "${{ secrets.REGISTRY_PASSWORD }}" | \ - docker login "${{ secrets.REGISTRY_URL }}" \ + docker login "${{ env.REGISTRY }}" \ -u "${{ secrets.REGISTRY_USER }}" \ --password-stdin; then exit 0 diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 6a1d2391..16583775 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -5,9 +5,13 @@ on: branches: - main +# Hosted on Codeberg's container registry. The shared +# REGISTRY_USER / REGISTRY_PASSWORD secrets carry the Codeberg +# token; URL is hardcoded so a wrong/missing secrets.REGISTRY_URL +# can't push to the wrong registry. env: - REGISTRY: git.mcintire.me - IMAGE_NAME: graham/prop + REGISTRY: codeberg.org + IMAGE_NAME: gmcintire/prop concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -89,7 +93,7 @@ jobs: max_attempts=3 while : ; do if echo "${{ secrets.REGISTRY_PASSWORD }}" | \ - docker login "${{ secrets.REGISTRY_URL }}" \ + docker login "${{ env.REGISTRY }}" \ -u "${{ secrets.REGISTRY_USER }}" \ --password-stdin; then exit 0