From ef1dc1767b25f08b79e5737ecd97e9492445c3ff Mon Sep 17 00:00:00 2001
From: Scott Leggett <scott@sl.id.au>
Date: Fri, 19 Apr 2024 16:17:19 +0800
Subject: [PATCH] chore: revert image name changes

With the recent CI changes the image name had a redundant component.
Revert to what it was before.
---
 .github/workflows/build.yaml | 12 ++++--------
 .goreleaser.yaml             | 16 ++++++++--------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 1df074f..b81b02c 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -10,10 +10,6 @@ jobs:
       contents: read
       packages: write
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        binary:
-        - lagoon-opensearch-sync
     steps:
     - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
       with:
@@ -38,9 +34,9 @@ jobs:
       id: docker_metadata
       uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # v5.5.1
       with:
-        images: ghcr.io/${{ github.repository }}/${{ matrix.binary }}
+        images: ghcr.io/${{ github.repository }}
     - run: echo "GITHUB_REPOSITORY_NAME=$(basename ${{ github.repository }})" >> "$GITHUB_ENV"
-    - name: Build and push ${{ matrix.binary }} container image
+    - name: Build and push container image
       if: github.actor != 'dependabot[bot]'
       uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0
       with:
@@ -48,5 +44,5 @@ jobs:
         tags: ${{ steps.docker_metadata.outputs.tags }}
         labels: ${{ steps.docker_metadata.outputs.labels }}
         file: Dockerfile
-        build-args: BINARY=${{ matrix.binary }}
-        context: dist/${{ matrix.binary }}_linux_amd64_v1
+        build-args: BINARY=lagoon-opensearch-sync
+        context: dist/lagoon-opensearch-sync_linux_amd64_v1
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index f20f125..f797cce 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -38,7 +38,7 @@ dockers:
 - ids:
   - lagoon-opensearch-sync
   image_templates:
-  - "ghcr.io/{{ .Env.GITHUB_REPOSITORY }}/lagoon-opensearch-sync:v{{ .Version }}-amd64"
+  - "ghcr.io/{{ .Env.GITHUB_REPOSITORY }}:v{{ .Version }}-amd64"
   use: buildx
   build_flag_templates:
   - "--build-arg=BINARY=lagoon-opensearch-sync"
@@ -46,7 +46,7 @@ dockers:
 - ids:
   - lagoon-opensearch-sync
   image_templates:
-  - "ghcr.io/{{ .Env.GITHUB_REPOSITORY }}/lagoon-opensearch-sync:v{{ .Version }}-arm64v8"
+  - "ghcr.io/{{ .Env.GITHUB_REPOSITORY }}:v{{ .Version }}-arm64v8"
   use: buildx
   goarch: arm64
   build_flag_templates:
@@ -54,14 +54,14 @@ dockers:
   - "--platform=linux/arm64/v8"
 
 docker_manifests:
-- name_template: "ghcr.io/{{ .Env.GITHUB_REPOSITORY }}/lagoon-opensearch-sync:v{{ .Version }}"
+- name_template: "ghcr.io/{{ .Env.GITHUB_REPOSITORY }}:v{{ .Version }}"
   image_templates:
-  - "ghcr.io/{{ .Env.GITHUB_REPOSITORY }}/lagoon-opensearch-sync:v{{ .Version }}-amd64"
-  - "ghcr.io/{{ .Env.GITHUB_REPOSITORY }}/lagoon-opensearch-sync:v{{ .Version }}-arm64v8"
-- name_template: "ghcr.io/{{ .Env.GITHUB_REPOSITORY }}/lagoon-opensearch-sync:latest"
+  - "ghcr.io/{{ .Env.GITHUB_REPOSITORY }}:v{{ .Version }}-amd64"
+  - "ghcr.io/{{ .Env.GITHUB_REPOSITORY }}:v{{ .Version }}-arm64v8"
+- name_template: "ghcr.io/{{ .Env.GITHUB_REPOSITORY }}:latest"
   image_templates:
-  - "ghcr.io/{{ .Env.GITHUB_REPOSITORY }}/lagoon-opensearch-sync:v{{ .Version }}-amd64"
-  - "ghcr.io/{{ .Env.GITHUB_REPOSITORY }}/lagoon-opensearch-sync:v{{ .Version }}-arm64v8"
+  - "ghcr.io/{{ .Env.GITHUB_REPOSITORY }}:v{{ .Version }}-amd64"
+  - "ghcr.io/{{ .Env.GITHUB_REPOSITORY }}:v{{ .Version }}-arm64v8"
 
 docker_signs:
 - args: