From bbc16d30056655a1a569305d546b68289f81972b Mon Sep 17 00:00:00 2001
From: danielhanrahan <daniel.hanrahan@est.tech>
Date: Tue, 28 Jun 2022 12:32:17 +0100
Subject: OCI image spec labels for DROOLS-PDP

Issue-ID: POLICY-4257
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: If6205f97318bc9cd3a4c1698a5fa18e08e67c0c3
---
 packages/docker/pom.xml                         | 26 +++++++++++++++++++++++++
 packages/docker/src/main/docker/Dockerfile      | 10 +++++++++-
 packages/docker/src/main/docker/suse.Dockerfile |  8 ++++++++
 3 files changed, 43 insertions(+), 1 deletion(-)

(limited to 'packages')

diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml
index e9dea0f0..79fd73a7 100644
--- a/packages/docker/pom.xml
+++ b/packages/docker/pom.xml
@@ -4,6 +4,7 @@
   ================================================================================
   Copyright (C) 2017-2018, 2021 AT&T Intellectual Property. All rights reserved.
   Modifications Copyright (C) 2019-2020 Bell Canada.
+  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.
@@ -67,6 +68,31 @@
                     </execution>
                 </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/docker/src/main/docker/Dockerfile b/packages/docker/src/main/docker/Dockerfile
index 904bb859..755827f1 100644
--- a/packages/docker/src/main/docker/Dockerfile
+++ b/packages/docker/src/main/docker/Dockerfile
@@ -2,7 +2,7 @@
 # Dockerfile
 # ============LICENSE_START=======================================================
 #  Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved.
-#  Modified Copyright (C) 2022 Nordix Foundation.
+#  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 +22,14 @@
 FROM onap/policy-jdk-alpine:2.4.3
 
 LABEL maintainer="Policy Team"
+LABEL org.opencontainers.image.title="Policy Drools PDP"
+LABEL org.opencontainers.image.description="Policy Drools PDP image based on Alpine"
+LABEL org.opencontainers.image.url="https://github.com/onap/policy-drools-pdp"
+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 BUILD_VERSION_DROOLS=${BUILD_VERSION_DROOLS}
 ARG POLICY_LOGS=/var/log/onap/policy/pdpd
diff --git a/packages/docker/src/main/docker/suse.Dockerfile b/packages/docker/src/main/docker/suse.Dockerfile
index 048546b3..715989a9 100644
--- a/packages/docker/src/main/docker/suse.Dockerfile
+++ b/packages/docker/src/main/docker/suse.Dockerfile
@@ -21,6 +21,14 @@
 FROM opensuse/leap:15.3
 
 LABEL maintainer="Policy Team"
+LABEL org.opencontainers.image.title="Policy Drools PDP"
+LABEL org.opencontainers.image.description="Policy Drools PDP image based on OpenSuse"
+LABEL org.opencontainers.image.url="https://github.com/onap/policy-drools-pdp"
+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 BUILD_VERSION_DROOLS=${BUILD_VERSION_DROOLS}
 ARG POLICY_LOGS=/var/log/onap/policy/pdpd
-- 
cgit 1.2.3-korg