From 016142334d536684a0ee48a88ec11bc7f0c7c0c5 Mon Sep 17 00:00:00 2001
From: John Simons <john.simons@particular.net>
Date: Thu, 23 Jan 2025 09:12:40 +1000
Subject: [PATCH] Update image labels

---
 .github/workflows/release.yml                 | 13 ++---------
 .../Dockerfile                                | 22 ++++++++++++-------
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d8204b94..d992da4b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -60,17 +60,8 @@ jobs:
           docker buildx build --push --tag ghcr.io/particular/servicecontrol-masstransit-connector:${{ env.TAG_NAME }} \
               --file src/ServiceControl.Connector.MassTransit.Host/Dockerfile \
               --build-arg VERSION=${{ env.MinVerVersion }} \
-              --annotation "index:org.opencontainers.image.title=ServiceControl.MassTransit.Connector" \
-              --annotation "index:org.opencontainers.image.description=MassTransit Connector for ServiceControl" \
-              --annotation "index:org.opencontainers.image.created=$(date '+%FT%TZ')" \
-              --annotation "index:org.opencontainers.image.revision=${{ github.sha }}" \
-              --annotation "index:org.opencontainers.image.authors=Particular Software" \
-              --annotation "index:org.opencontainers.image.vendor=Particular Software" \
-              --annotation "index:org.opencontainers.image.version=${{ env.MinVerVersion }}" \
-              --annotation "index:org.opencontainers.image.source=https://github.com/Particular/ServiceControl.Connector.MassTransit/tree/${{ github.sha }}" \
-              --annotation "index:org.opencontainers.image.url=https://hub.docker.com/r/particular/servicecontrol-masstransit-connector" \
-              --annotation "index:org.opencontainers.image.documentation=https://docs.particular.net/servicecontrol/" \
-              --annotation "index:org.opencontainers.image.base.name=mcr.microsoft.com/dotnet/runtime:8.0-noble-chiseled" \
+              --build-arg SHA=${{ github.sha }} \
+              --build-arg CREATED=$(date '+%FT%TZ') \
               --platform linux/arm64,linux/amd64 .
           docker buildx imagetools inspect ghcr.io/particular/servicecontrol-masstransit-connector:${{ env.TAG_NAME }}
       - name: Deploy
diff --git a/src/ServiceControl.Connector.MassTransit.Host/Dockerfile b/src/ServiceControl.Connector.MassTransit.Host/Dockerfile
index fd73018c..43ade816 100644
--- a/src/ServiceControl.Connector.MassTransit.Host/Dockerfile
+++ b/src/ServiceControl.Connector.MassTransit.Host/Dockerfile
@@ -9,16 +9,22 @@ RUN dotnet publish src/ServiceControl.Connector.MassTransit.Host/ServiceControl.
 
 # Runtime image
 FROM mcr.microsoft.com/dotnet/runtime:8.0-noble-chiseled
-ARG VERSION
+ARG VERSION=0.0.1
+ARG SHA=unknown
+ARG CREATED=2000-01-01T00:00:00Z
 WORKDIR /app
 
-LABEL org.opencontainers.image.source=https://github.com/Particular/ServiceControl.Connector.MassTransit \
-      org.opencontainers.image.authors="Particular Software" \
-      org.opencontainers.image.url=https://github.com/Particular/ServiceControl.Connector.MassTransit \
-      org.opencontainers.image.documentation=https://github.com/Particular/ServiceControl.Connector.MassTransit \
-      org.opencontainers.image.version=$VERSION \
-      org.opencontainers.image.title=ServiceControl.Connector.MassTransit \
-      org.opencontainers.image.description="ServiceControl MassTransit connector"
+LABEL org.opencontainers.image.source=https://github.com/Particular/ServiceControl.Connector.MassTransit/tree/$SHA
+LABEL org.opencontainers.image.authors="Particular Software"
+LABEL org.opencontainers.image.vendor="Particular Software"
+LABEL org.opencontainers.image.url=https://hub.docker.com/r/particular/servicecontrol-masstransit-connector
+LABEL org.opencontainers.image.documentation=https://hub.docker.com/r/particular/servicecontrol-masstransit-connector
+LABEL org.opencontainers.image.version=$VERSION
+LABEL org.opencontainers.image.revision=$SHA
+LABEL org.opencontainers.image.created=$CREATED
+LABEL org.opencontainers.image.title="MassTransit Connector for ServiceControl"
+LABEL org.opencontainers.image.description="An extension to ServiceControl that adds support for processing MassTransit failures with the Particular Platform."
+LABEL org.opencontainers.image.base.name=mcr.microsoft.com/dotnet/runtime:8.0-noble-chiseled
 
 COPY --from=build ./build /app