From a41e119720e80e2e3f9cf3ef6f1b326ed2ddfeb0 Mon Sep 17 00:00:00 2001 From: ahmza Date: Fri, 4 Sep 2026 12:46:31 +0000 Subject: [PATCH] Move publishing to organization namespace --- .gitea/README.md | 11 ++++++----- .gitea/workflows/publish.yml | 8 ++++---- Dockerfile | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.gitea/README.md b/.gitea/README.md index 9d7402a..18b369b 100644 --- a/.gitea/README.md +++ b/.gitea/README.md @@ -175,17 +175,18 @@ Kubernetes/SWS provides static hosting for the published Packwiz repositories. The publishing workflow runs [`scripts/build-site.sh`](../scripts/build-site.sh), which exports committed Git revisions into the documented URL layout, then builds the multi-architecture image -`tea.ahmza.com/ahmza/mcpacks-site`. +`tea.ahmza.com/ahmza.com/mcpacks-site`. The workflow finally commits that image's immutable OCI digest to -`apps/mcpacks/deployment.yaml` in the `ahmza/k8s-starter-pack` repository. +`apps/mcpacks/deployment.yaml` in the `ahmza.com/k8s-starter-pack` repository. Argo CD notices that commit and performs the rollout; the workflow does not hold Kubernetes credentials or change the cluster directly. -The Gitea Actions repository secret `GITEATOKEN` must be able to: +The Gitea Actions repository secret `GITEATOKEN` must belong to `ci-bot` +and be able to: -- push packages owned by `ahmza` -- read and write `ahmza/k8s-starter-pack` +- push packages owned by the `ahmza.com` organization +- read and write `ahmza.com/k8s-starter-pack` The `latest` image tag exists only to bootstrap the first Argo CD sync and for human inspection. Normal rollouts use the exact content digest recorded in the diff --git a/.gitea/workflows/publish.yml b/.gitea/workflows/publish.yml index cdba87f..3c57c5a 100644 --- a/.gitea/workflows/publish.yml +++ b/.gitea/workflows/publish.yml @@ -15,7 +15,7 @@ concurrency: env: REGISTRY: tea.ahmza.com - IMAGE_NAME: ahmza/mcpacks-site + IMAGE_NAME: ahmza.com/mcpacks-site jobs: publish: @@ -66,7 +66,7 @@ jobs: uses: docker/login-action@v3 with: registry: ${{ env.REGISTRY }} - username: ${{ gitea.repository_owner }} + username: ci-bot password: ${{ secrets.GITEATOKEN }} # The SWS runtime image already publishes amd64 and arm64 variants and @@ -94,7 +94,7 @@ jobs: - name: Check out cluster GitOps repository uses: actions/checkout@v4 with: - repository: ahmza/k8s-starter-pack + repository: ahmza.com/k8s-starter-pack ref: main token: ${{ secrets.GITEATOKEN }} path: _gitops @@ -113,7 +113,7 @@ jobs: manifest = Path("_gitops/apps/mcpacks/deployment.yaml") image = sys.argv[1] prefix = " image: " - repository = "tea.ahmza.com/ahmza/mcpacks-site" + repository = "tea.ahmza.com/ahmza.com/mcpacks-site" lines = manifest.read_text().splitlines() matches = [ i for i, line in enumerate(lines) diff --git a/Dockerfile b/Dockerfile index c33d639..1669597 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ FROM ghcr.io/static-web-server/static-web-server:2.44.0@sha256:2c1a7c3e0feaea5859307403b74e1c575f3ec1499094fc077344173d11abaae2 ARG VCS_REF=unknown -LABEL org.opencontainers.image.source="https://tea.ahmza.com/ahmza/mcpacks" \ +LABEL org.opencontainers.image.source="https://tea.ahmza.com/ahmza.com/mcpacks" \ org.opencontainers.image.revision="$VCS_REF" \ org.opencontainers.image.description="Static Packwiz repositories for AGS Minecraft servers"