From 988d8dbdd11ff6b13e1e0698ea06bb02a6f7c16f Mon Sep 17 00:00:00 2001 From: Kat Morgan Date: Sat, 9 Dec 2023 19:42:55 -0800 Subject: [PATCH] add multi-arch annotations --- .github/workflows/konductor.yaml | 2 ++ Dockerfile | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/konductor.yaml b/.github/workflows/konductor.yaml index 34f74e4..6f45505 100644 --- a/.github/workflows/konductor.yaml +++ b/.github/workflows/konductor.yaml @@ -79,6 +79,7 @@ jobs: context: . file: Dockerfile platforms: linux/amd64,linux/arm64 + annotations: '"annotations": { "org.opencontainers.image.description": "ContainerCraft Konductor DevOps Container" }' tags: "ghcr.io/${{ steps.repository.outputs.lowercase }}:latest,ghcr.io/${{ steps.repository.outputs.lowercase }}:${{ github.sha }}" - if: ${{ github.event_name == 'push' }} && ${{ github.ref == 'refs/heads/main' }} @@ -91,5 +92,6 @@ jobs: context: . file: Dockerfile platforms: linux/amd64,linux/arm64 + annotations: '"annotations": { "org.opencontainers.image.description": "ContainerCraft Konductor DevOps Container" }' tags: "ghcr.io/${{ steps.repository.outputs.lowercase }}:latest,ghcr.io/${{ steps.repository.outputs.lowercase }}:${{ github.sha }}" diff --git a/Dockerfile b/Dockerfile index 3ca788b..0930033 100644 --- a/Dockerfile +++ b/Dockerfile @@ -542,7 +542,7 @@ LABEL \ summary="CCIO Konductor DevOps Container" \ io.openshift.tags="containercraft,konductor" \ description="CCIO Konductor DevOps Container" \ - io.k8s.description="CCIO Konductor DevOps Container" + io.k8s.description="ContainerCraft Konductor DevOps Container" LABEL org.opencontainers.image.source="https://github.com/containercraft/konductor" LABEL org.opencontainers.image.description="Konductor is as a DevOps Userspace Container.\ Included:\