From 2d806d855710b90d1dd18378bf2acfe3eaa2b39b Mon Sep 17 00:00:00 2001
From: jamesread <contact@jread.com>
Date: Fri, 24 Mar 2023 17:45:19 +0000
Subject: [PATCH] cicd: Cleanup image tags, try pass correct credentials to
 goreleaser

---
 .github/workflows/build-tag.yml | 2 +-
 .goreleaser.yml                 | 3 ---
 Dockerfile                      | 1 +
 Dockerfile.arm64                | 1 +
 Dockerfile.armv7                | 1 +
 5 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-tag.yml b/.github/workflows/build-tag.yml
index c254c76..cd7285b 100644
--- a/.github/workflows/build-tag.yml
+++ b/.github/workflows/build-tag.yml
@@ -57,7 +57,7 @@ jobs:
           version: latest
           args: release --clean --parallelism 1
         env:
-          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Archive binaries
         uses: actions/upload-artifact@v2
diff --git a/.goreleaser.yml b/.goreleaser.yml
index b4a42a2..f1c3059 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -96,10 +96,8 @@ dockers:
     skip_push: false
     build_flag_templates:
       - "--platform=linux/amd64"
-      - "--label=org.opencontainers.image.title={{.ProjectName}}"
       - "--label=org.opencontainers.image.revision={{.FullCommit}}"
       - "--label=org.opencontainers.image.version={{.Tag}}"
-      - "--platform=linux/amd64"
     extra_files:
       - webui
 
@@ -112,7 +110,6 @@ dockers:
     skip_push: false
     build_flag_templates:
       - "--platform=linux/arm64"
-      - "--label=org.opencontainers.image.title={{.ProjectName}}"
       - "--label=org.opencontainers.image.revision={{.FullCommit}}"
       - "--label=org.opencontainers.image.version={{.Tag}}"
     extra_files:
diff --git a/Dockerfile b/Dockerfile
index d3e72a1..bd931f2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,7 @@
 FROM --platform=linux/amd64 registry.fedoraproject.org/fedora-minimal:36-x86_64
 
 LABEL org.opencontainers.image.source https://github.com/OliveTin/OliveTin
+LABEL org.opencontainers.image.title=OliveTin
 
 RUN mkdir -p /config /var/www/olivetin \
     && microdnf install -y --nodocs --noplugins --setopt=keepcache=0 --setopt=install_weak_deps=0 \ 
diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
index b171685..e3361fe 100644
--- a/Dockerfile.arm64
+++ b/Dockerfile.arm64
@@ -1,6 +1,7 @@
 FROM --platform=linux/arm64 registry.fedoraproject.org/fedora-minimal:36-aarch64
 
 LABEL org.opencontainers.image.source https://github.com/OliveTin/OliveTin
+LABEL org.opencontainers.image.title=OliveTin
 
 RUN mkdir -p /config /var/www/olivetin \
     && \
diff --git a/Dockerfile.armv7 b/Dockerfile.armv7
index 802a151..c7e9bab 100644
--- a/Dockerfile.armv7
+++ b/Dockerfile.armv7
@@ -1,6 +1,7 @@
 FROM --platform=linux/armhfp registry.fedoraproject.org/fedora-minimal:36-armhfp
 
 LABEL org.opencontainers.image.source https://github.com/OliveTin/OliveTin
+LABEL org.opencontainers.image.title=OliveTin
 
 RUN mkdir -p /config /var/www/olivetin \
     && \