use same labels as Hyperledger-Fabric

Signed-off-by: pco <pasquale.convertini@ibm.com>

Author: pasquale95

.github/workflows/docker-release.yml

@@ -63,8 +63,10 @@ jobs:
       - name: Build cross-architecture binaries
         run: make build-arch build-test-genesis-block
 
-      - name: Set image prefix
+      - name: Set image build prefix and metadata
         run: |
+          echo "CREATED=$(date -u +%Y-%m-%dT%H:%M:%SZ)" >> $GITHUB_ENV
+          echo "REVISION=$(git rev-parse HEAD)" >> $GITHUB_ENV        
           if [ "$GITHUB_REPOSITORY_OWNER" == "hyperledger" ]; then
            echo "IMAGE_PREFIX=hyperledger" >> $GITHUB_ENV
           else
@@ -89,6 +91,8 @@ jobs:
             ARCHBIN_PATH=archbin
             PORTS=4001 2114 9001 2119 5001 2115 6001 2116 7001 2117
             VERSION=${{ env.VERSION }}
+            CREATED=${{ env.CREATED }}
+            REVISION=${{ env.REVISION }}
           cache-from: type=registry,ref=docker.io/${{ env.IMAGE_PREFIX }}/fabric-x-committer:buildcache
           cache-to: type=registry,ref=docker.io/${{  env.IMAGE_PREFIX  }}/fabric-x-committer:buildcache,mode=max
 
@@ -109,6 +113,8 @@ jobs:
             ARCHBIN_PATH=archbin
             PORTS=8001 2118
             VERSION=${{ env.VERSION }}
+            CREATED=${{ env.CREATED }}
+            REVISION=${{ env.REVISION }}
           cache-from: type=registry,ref=docker.io/${{ env.IMAGE_PREFIX }}/fabric-x-loadgen:buildcache
           cache-to: type=registry,ref=docker.io/${{  env.IMAGE_PREFIX  }}/fabric-x-loadgen:buildcache,mode=max
 
@@ -127,5 +133,7 @@ jobs:
           build-args: |
             ARCHBIN_PATH=archbin
             VERSION=${{ env.VERSION }}
+            CREATED=${{ env.CREATED }}
+            REVISION=${{ env.REVISION }}
           cache-from: type=registry,ref=docker.io/${{ env.IMAGE_PREFIX }}/fabric-x-committer-test-node:buildcache
           cache-to: type=registry,ref=docker.io/${{  env.IMAGE_PREFIX  }}/fabric-x-committer-test-node:buildcache,mode=max

docker/images/release/Dockerfile

@@ -14,7 +14,11 @@ ARG ARCHBIN_PATH
 ARG TARGETOS
 ARG TARGETARCH
 ARG PORTS
+
+# Label args
 ARG VERSION=1.0
+ARG CREATED
+ARG REVISION=1.0
 
 # Add non-root user (10001) using BIN argument
 RUN /usr/sbin/useradd -u 10001 -r -g root -s /sbin/nologin -c "Hyperledger Fabric-X ${BIN} user" ${BIN} && \
@@ -33,12 +37,15 @@ RUN ln -s /bin/${BIN} /bin/entrypoint
 EXPOSE ${PORTS}
 
 # OCI metadata labels
-LABEL name="${BIN}" \
-    maintainer="IBM Research ZRL Decentralized Trust Group" \
-    version="${VERSION}" \
-    description="Hyperledger Fabric-X ${BIN} packaged in a UBI image" \
-    license="Apache-2.0" \
-    vendor="IBM"
+LABEL org.opencontainers.image.created="${CREATED}" \
+    org.opencontainers.image.description="Hyperledger Fabric-X ${BIN} packaged in a UBI image." \
+    org.opencontainers.image.licenses="Apache-2.0" \
+    org.opencontainers.image.ref.name="ubi9/ubi-minimal" \
+    org.opencontainers.image.revision="${REVISION}" \
+    org.opencontainers.image.source="https://github.com/hyperledger/fabric-x-committer" \
+    org.opencontainers.image.title="fabric-x-${BIN}" \
+    org.opencontainers.image.url="https://github.com/hyperledger/fabric-x-committer" \
+    org.opencontainers.image.version="${VERSION}"
 
 # Use non-root user and set workdir using BIN argument
 USER 10001

docker/images/test_node/Dockerfile

@@ -43,12 +43,15 @@ RUN chmod a+x ${BINS_PATH}/*
 EXPOSE 7050 4001 2114 7001 2117 2110
 
 # OCI metadata labels
-LABEL name="fabric-x-committer-test-node" \
-    maintainer="IBM Research Decentralized Trust Group" \
-    version="${VERSION}" \
-    description="Preconfigured Hyperledger Fabric-X Committer Node" \
-    license="Apache-2.0" \
-    vendor="IBM"
+LABEL org.opencontainers.image.created="${CREATED}" \
+    org.opencontainers.image.description="Hyperledger Fabric-X Committer Test Node." \
+    org.opencontainers.image.licenses="Apache-2.0" \
+    org.opencontainers.image.ref.name="postgres" \
+    org.opencontainers.image.revision="${REVISION}" \
+    org.opencontainers.image.source="https://github.com/hyperledger/fabric-x-committer" \
+    org.opencontainers.image.title="fabric-x-committer-test-node" \
+    org.opencontainers.image.url="https://github.com/hyperledger/fabric-x-committer" \
+    org.opencontainers.image.version="${VERSION}"
 
 # Default CMD
 CMD ["run"]

scripts/build-release-image.sh

@@ -26,6 +26,8 @@ function build_image() {
     --build-arg PORTS="${service_ports}"
     --build-arg ARCHBIN_PATH="${arch_bin_dir}"
     --build-arg VERSION="${version}"
+    --build-arg CREATED="$(date -u +%Y-%m-%dT%H:%M:%SZ)"
+    --build-arg REVISION="$(git rev-parse HEAD)"
   )
 
   if [ "${multiplatform}" = true ]; then