From 720425db47801f0b8ecccd76ebea43f1e217b6fd Mon Sep 17 00:00:00 2001
From: danielhanrahan <daniel.hanrahan@est.tech>
Date: Tue, 28 Jun 2022 15:02:53 +0100
Subject: OCI image spec labels for distribution

Issue-ID: POLICY-4260
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: I9c1e3e48c80298330177e310f73b4473fba8f436
---
 packages/policy-distribution-docker/pom.xml        | 24 ++++++++++++++++++++++
 .../src/main/docker/Dockerfile                     |  9 ++++++++
 .../src/main/docker/suse.Dockerfile                |  8 ++++++++
 3 files changed, 41 insertions(+)

diff --git a/packages/policy-distribution-docker/pom.xml b/packages/policy-distribution-docker/pom.xml
index 3a5c36ba..79ce0361 100644
--- a/packages/policy-distribution-docker/pom.xml
+++ b/packages/policy-distribution-docker/pom.xml
@@ -67,6 +67,30 @@
                 </executions>
             </plugin>
 
+            <plugin>
+                <groupId>io.github.git-commit-id</groupId>
+                <artifactId>git-commit-id-maven-plugin</artifactId>
+                <version>5.0.0</version>
+                <executions>
+                    <execution>
+                        <id>get-the-git-infos</id>
+                        <goals>
+                            <goal>revision</goal>
+                        </goals>
+                        <phase>initialize</phase>
+                    </execution>
+                </executions>
+                <configuration>
+                    <skipPoms>false</skipPoms>
+                    <generateGitPropertiesFile>true</generateGitPropertiesFile>
+                    <includeOnlyProperties>
+                        <includeOnlyProperty>^git.build.(time|version)$</includeOnlyProperty>
+                        <includeOnlyProperty>^git.commit.id.abbrev$</includeOnlyProperty>
+                    </includeOnlyProperties>
+                    <commitIdGenerationMode>full</commitIdGenerationMode>
+                </configuration>
+            </plugin>
+
             <plugin>
                 <groupId>io.fabric8</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
diff --git a/packages/policy-distribution-docker/src/main/docker/Dockerfile b/packages/policy-distribution-docker/src/main/docker/Dockerfile
index 4db1f21c..85c90f82 100644
--- a/packages/policy-distribution-docker/src/main/docker/Dockerfile
+++ b/packages/policy-distribution-docker/src/main/docker/Dockerfile
@@ -2,6 +2,7 @@
 # Dockerfile
 # ============LICENSE_START=======================================================
 #  Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved.
+#  Modifications Copyright (C) 2022 Nordix Foundation.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -22,6 +23,14 @@
 FROM onap/policy-jre-alpine:2.4.3
 
 LABEL maintainer="Policy Team"
+LABEL org.opencontainers.image.title="Policy SDC Service Distribution"
+LABEL org.opencontainers.image.description="Policy SDC Service Distribution image based on Alpine"
+LABEL org.opencontainers.image.url="https://github.com/onap/policy-distribution"
+LABEL org.opencontainers.image.vendor="ONAP Policy Team"
+LABEL org.opencontainers.image.licenses="Apache-2.0"
+LABEL org.opencontainers.image.created="${git.build.time}"
+LABEL org.opencontainers.image.version="${git.build.version}"
+LABEL org.opencontainers.image.revision="${git.commit.id.abbrev}"
 
 ARG POLICY_LOGS=/var/log/onap/policy/distribution
 
diff --git a/packages/policy-distribution-docker/src/main/docker/suse.Dockerfile b/packages/policy-distribution-docker/src/main/docker/suse.Dockerfile
index 6b9dd873..74039933 100644
--- a/packages/policy-distribution-docker/src/main/docker/suse.Dockerfile
+++ b/packages/policy-distribution-docker/src/main/docker/suse.Dockerfile
@@ -22,6 +22,14 @@
 FROM opensuse/leap:15.3
 
 LABEL maintainer="Policy Team"
+LABEL org.opencontainers.image.title="Policy SDC Service Distribution"
+LABEL org.opencontainers.image.description="Policy SDC Service Distribution image based on OpenSuse"
+LABEL org.opencontainers.image.url="https://github.com/onap/policy-distribution"
+LABEL org.opencontainers.image.vendor="ONAP Policy Team"
+LABEL org.opencontainers.image.licenses="Apache-2.0"
+LABEL org.opencontainers.image.created="${git.build.time}"
+LABEL org.opencontainers.image.version="${git.build.version}"
+LABEL org.opencontainers.image.revision="${git.commit.id.abbrev}"
 
 ARG POLICY_LOGS=/var/log/onap/policy/distribution
 
-- 
cgit 1.2.3-korg