From 068f08d96d1578f15aa993f228d2df688b044666 Mon Sep 17 00:00:00 2001 From: steve Date: Fri, 15 May 2026 19:50:50 +0000 Subject: [PATCH 1/2] ci: migrate release workflow to zot registry --- .gitea/workflows/release.yml | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 9c0c078..387e4ba 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -12,18 +12,12 @@ # plus install.sh / install.ps1 / the systemd unit baked in under # /opt/restic-manager/dist (the read-only fallback path the server # handlers use when /... is empty). -# * Pushes to this Gitea instance's container registry under -# //restic-manager. +# * Pushes to zot OCI registry (docker.dcglab.co.uk). # # Tag fan-out # * tag push: :vX.Y.Z, :X.Y, :X # * tag push and X >= 1: also :latest # * workflow_dispatch: only :snapshot-; nothing else moves. -# -# Why no goreleaser -# The architecture already routes agent distribution through the -# server's /agent/binary endpoint. The image is the only deliverable; -# binary archives would just be a second source of truth. name: Release @@ -34,8 +28,8 @@ on: workflow_dispatch: env: - REGISTRY: gitea.dcglab.co.uk - IMAGE_NAME: ${{ gitea.repository }} + REGISTRY: docker.dcglab.co.uk + IMAGE_NAME: restic-manager # Force bash as the default shell — see ci.yml header. defaults: @@ -46,19 +40,23 @@ jobs: image: name: Build + push image runs-on: ubuntu-latest - container: gitea.dcglab.co.uk/steve/ci-runner-go:2026-05-08 + container: + image: docker.dcglab.co.uk/ci-runner-go:2026-05-15 + credentials: + username: ${{ secrets.ZOT_USERNAME }} + password: ${{ secrets.ZOT_PASSWORD }} steps: - uses: actions/checkout@v4 - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - - name: Log in to Gitea registry + - name: Log in to zot registry uses: docker/login-action@v3 with: registry: ${{ env.REGISTRY }} - username: ${{ gitea.actor }} - password: ${{ secrets.DEV_TOKEN }} + username: ${{ secrets.ZOT_USERNAME }} + password: ${{ secrets.ZOT_PASSWORD }} - name: Compute tags + version id: meta From c6f73f790d4430d2dd712d4b5d9d4b26b45fd614 Mon Sep 17 00:00:00 2001 From: steve Date: Fri, 15 May 2026 19:51:02 +0000 Subject: [PATCH 2/2] ci: pull ci-runner-go from zot registry --- .gitea/workflows/ci.yml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index d9f0cfa..42fc30d 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -70,7 +70,11 @@ jobs: # one runner. The third shard ("rest") covers everything else. name: Test (${{ matrix.name }}) runs-on: ubuntu-latest - container: gitea.dcglab.co.uk/steve/ci-runner-go:2026-05-08 + container: + image: docker.dcglab.co.uk/ci-runner-go:2026-05-15 + credentials: + username: ${{ secrets.ZOT_USERNAME }} + password: ${{ secrets.ZOT_PASSWORD }} strategy: fail-fast: false matrix: @@ -105,7 +109,11 @@ jobs: lint: name: Lint runs-on: ubuntu-latest - container: gitea.dcglab.co.uk/steve/ci-runner-go:2026-05-08 + container: + image: docker.dcglab.co.uk/ci-runner-go:2026-05-15 + credentials: + username: ${{ secrets.ZOT_USERNAME }} + password: ${{ secrets.ZOT_PASSWORD }} steps: - uses: actions/checkout@v4 - uses: golangci/golangci-lint-action@v7 @@ -121,7 +129,11 @@ jobs: build: name: Build (${{ matrix.goos }}/${{ matrix.goarch }}) runs-on: ubuntu-latest - container: gitea.dcglab.co.uk/steve/ci-runner-go:2026-05-08 + container: + image: docker.dcglab.co.uk/ci-runner-go:2026-05-15 + credentials: + username: ${{ secrets.ZOT_USERNAME }} + password: ${{ secrets.ZOT_PASSWORD }} strategy: fail-fast: false matrix: