From 25aeb2e3ea047fa8c32df06108b3d9541940659a Mon Sep 17 00:00:00 2001
From: Jamie Wilkinson <jaq@spacepants.org>
Date: Thu, 17 Oct 2024 10:50:56 +1100
Subject: [PATCH] ci: Update goreleaser config for containers

---
 .github/workflows/tag-new-release.yml |  2 +-
 .goreleaser.yml                       | 34 +++++++++++++--------------
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/tag-new-release.yml b/.github/workflows/tag-new-release.yml
index 6a302488..b78a5b16 100644
--- a/.github/workflows/tag-new-release.yml
+++ b/.github/workflows/tag-new-release.yml
@@ -15,7 +15,7 @@ jobs:
       - uses: mathieudutour/github-tag-action@v6.2
         continue-on-error: true  # ok to not make a new tag
         with:
-          # Special PAT so that we trigger new workflows
+          # Special PAT so that we trigger new workflows, that has contents:write only
           github_token: ${{ secrets.TAG_TOKEN }}
           create_annotated_tag: true
           custom_release_rules: ci:none,chore:none,style:none
diff --git a/.goreleaser.yml b/.goreleaser.yml
index 2d74456b..607a4708 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -32,47 +32,45 @@ release:
   github:
   name_template: v{{.Version}}
 dockers:
-- image_templates: ["ghcr.io/google/{{ .ProjectName }}:{{ .Version }}-amd64"]
+- image_templates: ["ghcr.io/jaqx0r/{{ .ProjectName }}:{{ .Version }}-amd64"]
   dockerfile: Dockerfile.goreleaser
   use: buildx
   build_flag_templates:
     - --platform=linux/amd64
-    - --label=org.opencontainers.image.ref.name="google/mtail"
+    - --label=org.opencontainers.image.ref.name="jaqx0r/mtail"
     - --label=org.opencontainers.image.authors="Jamie Wilkinson (@jaqx0r)"
     - --label=org.opencontainers.image.created={{ time "2006-01-02T15:04:05Z07:00" }}
     - --label=org.opencontainers.image.description="extract internal monitoring data from application logs for collection in a timeseries database"
-    - --label=org.opencontainers.image.documentation="https://google.github.io/mtail/"
+    - --label=org.opencontainers.image.documentation="https://jaqx0r.github.io/mtail/"
     - --label=org.opencontainers.image.licenses="Apache-2.0"
     - --label=org.opencontainers.image.revision={{ .FullCommit }}
-    - --label=org.opencontainers.image.source=https://github.com/google/{{ .ProjectName }}
+    - --label=org.opencontainers.image.source=https://github.com/jaqx0r/{{ .ProjectName }}
     - --label=org.opencontainers.image.title={{ .ProjectName }}
-    - --label=org.opencontainers.image.url=https://github.com/google/{{ .ProjectName }}
-    - --label=org.opencontainers.image.vendor="Google"
+    - --label=org.opencontainers.image.url=https://github.com/jaqx0r/{{ .ProjectName }}
     - --label=org.opencontainers.image.version={{ .Version }}
-- image_templates: ["ghcr.io/google/{{ .ProjectName }}:{{ .Version }}-arm64v8"]
+- image_templates: ["ghcr.io/jaqx0r/{{ .ProjectName }}:{{ .Version }}-arm64v8"]
   goarch: arm64
   dockerfile: Dockerfile.goreleaser
   use: buildx
   build_flag_templates:
     - --platform=linux/arm64/v8
-    - --label=org.opencontainers.image.ref.name="google/mtail"
+    - --label=org.opencontainers.image.ref.name="jaqx0r/mtail"
     - --label=org.opencontainers.image.authors="Jamie Wilkinson (@jaqx0r)"
     - --label=org.opencontainers.image.created={{ time "2006-01-02T15:04:05Z07:00" }}
     - --label=org.opencontainers.image.description="extract internal monitoring data from application logs for collection in a timeseries database"
-    - --label=org.opencontainers.image.documentation="https://google.github.io/mtail/"
+    - --label=org.opencontainers.image.documentation="https://jaqx0r.github.io/mtail/"
     - --label=org.opencontainers.image.licenses="Apache-2.0"
     - --label=org.opencontainers.image.revision={{ .FullCommit }}
-    - --label=org.opencontainers.image.source=https://github.com/google/{{ .ProjectName }}
+    - --label=org.opencontainers.image.source=https://github.com/jaqx0r/{{ .ProjectName }}
     - --label=org.opencontainers.image.title={{ .ProjectName }}
-    - --label=org.opencontainers.image.url=https://github.com/google/{{ .ProjectName }}
-    - --label=org.opencontainers.image.vendor="Google"
+    - --label=org.opencontainers.image.url=https://github.com/jaqx0r/{{ .ProjectName }}
     - --label=org.opencontainers.image.version={{ .Version }}
 docker_manifests:
-  - name_template: ghcr.io/google/{{ .ProjectName }}:{{ .Version }}
+  - name_template: ghcr.io/jaqx0r/{{ .ProjectName }}:{{ .Version }}
     image_templates:
-      - ghcr.io/google/{{ .ProjectName }}:{{ .Version }}-amd64
-      - ghcr.io/google/{{ .ProjectName }}:{{ .Version }}-arm64v8
-  - name_template: ghcr.io/google/{{ .ProjectName }}:latest
+      - ghcr.io/jaqx0r/{{ .ProjectName }}:{{ .Version }}-amd64
+      - ghcr.io/jaqx0r/{{ .ProjectName }}:{{ .Version }}-arm64v8
+  - name_template: ghcr.io/jaqx0r/{{ .ProjectName }}:latest
     image_templates:
-      - ghcr.io/google/{{ .ProjectName }}:{{ .Version }}-amd64
-      - ghcr.io/google/{{ .ProjectName }}:{{ .Version }}-arm64v8
+      - ghcr.io/jaqx0r/{{ .ProjectName }}:{{ .Version }}-amd64
+      - ghcr.io/jaqx0r/{{ .ProjectName }}:{{ .Version }}-arm64v8