remove index annotations

gofractally · May 14, 2024 · 22e4cbe · 22e4cbe
1 parent 723c21d
commit 22e4cbe
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/.github/workflows/builder-ubuntu.yml b/.github/workflows/builder-ubuntu.yml
@@ -90,7 +90,7 @@ jobs:
           tags: "ghcr.io/${{ github.repository_owner }}/${{ steps.prep.outputs.image }}:${{ github.sha }}-${{ matrix.platform_short }}"
           platforms: ${{ matrix.platform }}
           provenance: false
-          outputs: type=image,annotation-index.org.opencontainers.image.description=Psibase build environment with Ubuntu ${{ inputs.ubuntu_version }} on ${{ matrix.platform }}
+          outputs: type=image
 
       - name: (PR Only) - Build image archive
         id: archive

diff --git a/.github/workflows/contributor.yml b/.github/workflows/contributor.yml
@@ -149,7 +149,7 @@ jobs:
           tags: "ghcr.io/${{ github.repository_owner }}/psibase-contributor:${{ github.sha }}-${{ matrix.platform_short }}"
           platforms: ${{ matrix.platform }}
           provenance: false
-          outputs: type=image,annotation-index.org.opencontainers.image.description=Psibase development environment
+          outputs: type=image
 
       - name: (PR Only) - Build image archive
         if: ${{ github.event_name == 'pull_request' }}
@@ -275,7 +275,7 @@ jobs:
           tags: "ghcr.io/${{ github.repository_owner }}/psibase-contributor:${{ github.sha }}-${{ matrix.platform_short }}"
           platforms: ${{ matrix.platform }}
           provenance: false
-          outputs: type=image,annotation-index.org.opencontainers.image.description=Psibase development environment
+          outputs: type=image
   merge: 
     name: merge multi-platform images
     if: ${{ github.event_name != 'pull_request' }}

diff --git a/.github/workflows/tool-config.yml b/.github/workflows/tool-config.yml
@@ -86,7 +86,7 @@ jobs:
           tags: "ghcr.io/${{ github.repository_owner }}/${{ steps.prep.outputs.image }}:${{ github.sha }}-${{ matrix.platform_short }}"
           platforms: ${{ matrix.platform }}
           provenance: false
-          outputs: type=image,annotation-index.org.opencontainers.image.description=Config files for admin dashboard tools connecting to psinode over ${{ matrix.protocol }}
+          outputs: type=image
 
       - name: (PR Only) - Build image archive
         if: ${{ github.event_name == 'pull_request' }}

diff --git a/docker/psibase-contributor.Dockerfile b/docker/psibase-contributor.Dockerfile
@@ -121,3 +121,10 @@ export HOST_IP=$(ip route | awk "/default/ { print \$3 }") \
 ENV CCACHE_DIR=${PSINODE_PATH}/.caches/ccache
 ENV SCCACHE_DIR=${PSINODE_PATH}/.caches/sccache
 ENV CCACHE_CONFIGPATH=${PSINODE_PATH}/ccache.conf
+
+LABEL org.opencontainers.image.title="psibase-contributor"
+LABEL org.opencontainers.image.description="Psibase development environment"
+LABEL org.opencontainers.image.vendor="Fractally"
+LABEL org.opencontainers.image.url="https://github.com/gofractally/image-builders/pkgs/container/psibase-contributor"
+LABEL org.opencontainers.image.documentation="https://github.com/gofractally/image-builders"
+LABEL org.opencontainers.image.source="https://github.com/gofractally/image-builders"