From 9ca44f0b01602ca6ae1d6c2c705338f9ef0d4e24 Mon Sep 17 00:00:00 2001 From: trick77 Date: Sun, 17 May 2026 11:00:36 +0200 Subject: [PATCH] fix: image and log banner say riptide-collector, not riptide MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The first release.yaml run pushed to ghcr.io/trick77/riptide because the workflow used \${{ github.repository }}. The image, Python package, module, and historic ci.yaml path all carry the name 'riptide-collector', not 'riptide' — the GitHub repo is the odd one out. Pin the image name explicitly to riptide-collector and align the startup log banner with the same name so Splunk panels grepping msg=\" version: …\" match the image tag readers actually pull. The stray 0.1.0 git tag and the orphan ghcr.io/trick77/riptide package are deleted out-of-band; the next release run starts fresh at 0.1.0 under the correct path. --- .github/workflows/release.yaml | 10 +++++----- src/riptide_collector/main.py | 6 ++++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 330203a..1787b38 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -77,10 +77,10 @@ jobs: build-args: | RIPTIDE_VERSION=${{ steps.ver.outputs.version }} tags: | - ghcr.io/${{ github.repository }}:${{ steps.ver.outputs.version }} - ghcr.io/${{ github.repository }}:${{ steps.ver.outputs.major }}.${{ steps.ver.outputs.minor }} - ghcr.io/${{ github.repository }}:${{ steps.ver.outputs.major }} - ghcr.io/${{ github.repository }}:${{ steps.ver.outputs.short }} - ghcr.io/${{ github.repository }}:latest + ghcr.io/${{ github.repository_owner }}/riptide-collector:${{ steps.ver.outputs.version }} + ghcr.io/${{ github.repository_owner }}/riptide-collector:${{ steps.ver.outputs.major }}.${{ steps.ver.outputs.minor }} + ghcr.io/${{ github.repository_owner }}/riptide-collector:${{ steps.ver.outputs.major }} + ghcr.io/${{ github.repository_owner }}/riptide-collector:${{ steps.ver.outputs.short }} + ghcr.io/${{ github.repository_owner }}/riptide-collector:latest cache-from: type=gha cache-to: type=gha,mode=max diff --git a/src/riptide_collector/main.py b/src/riptide_collector/main.py index 26bad79..1d905e6 100644 --- a/src/riptide_collector/main.py +++ b/src/riptide_collector/main.py @@ -59,8 +59,10 @@ def create_app(settings: Settings | None = None) -> FastAPI: @asynccontextmanager async def lifespan(_app: FastAPI): # pyright: ignore[reportUnusedFunction] # Match the noergler shape exactly so a Splunk panel that greps - # `msg=" version: …"` works across both services. - logger.info(f"riptide version: {__version__}") + # `msg=" version: …"` works across both services. The + # service name mirrors the container image / Python package name + # (riptide-collector), not the GitHub repository (riptide). + logger.info(f"riptide-collector version: {__version__}") logger.info( "riptide_collector_starting", version=__version__,