Merge "OCI image spec labels for clamp backend"

3 files changed, 46 insertions, 5 deletions

diff --git a/runtime/pom.xml b/runtime/pom.xml
index 7e3d7b261..606d1beef 100644
--- a/runtime/pom.xml
+++ b/runtime/pom.xml
@@ -4,7 +4,7 @@
   ONAP POLICY-CLAMP
   ================================================================================
   Copyright (C) 2017-2021 AT&T Intellectual Property. All rights reserved.
-  Modifications Copyright (C) 2021 Nordix Foundation.
+  Modifications Copyright (C) 2021-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.
@@ -650,6 +650,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/runtime/src/main/docker/backend/Dockerfile b/runtime/src/main/docker/backend/Dockerfile
index bb964158e..7bb335777 100644
--- a/runtime/src/main/docker/backend/Dockerfile
+++ b/runtime/src/main/docker/backend/Dockerfile
@@ -2,8 +2,8 @@
 # ============LICENSE_START=======================================================

 # ONAP CLAMP

 # ================================================================================

-# Copyright (C) 2018, 2021 AT&T Intellectual Property. All rights

-#                             reserved.

+# Copyright (C) 2018, 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.

@@ -23,8 +23,16 @@
 

 FROM onap/integration-java11:8.0.0

 

-MAINTAINER "The Onap Team"

+LABEL maintainer="Policy Team"

 LABEL Description="This image contains alpine, openjdk 11 and policy clamp"

+LABEL org.opencontainers.image.title="Policy CLAMP runtime"

+LABEL org.opencontainers.image.description="Policy CLAMP runtime image based on Alpine"

+LABEL org.opencontainers.image.url="https://github.com/onap/policy-clamp"

+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 http_proxy

 ARG https_proxy

diff --git a/runtime/src/main/docker/backend/suse.Dockerfile b/runtime/src/main/docker/backend/suse.Dockerfile
index 9ab542453..704dfa328 100644
--- a/runtime/src/main/docker/backend/suse.Dockerfile
+++ b/runtime/src/main/docker/backend/suse.Dockerfile
@@ -22,8 +22,16 @@
 
 FROM opensuse/leap:15.3
 
-MAINTAINER "The Onap Team"
+LABEL maintainer="Policy Team"
 LABEL Description="This image contains opensuse, openjdk 11 and policy clamp"
+LABEL org.opencontainers.image.title="Policy CLAMP runtime"
+LABEL org.opencontainers.image.description="Policy CLAMP runtime image based on OpenSuse"
+LABEL org.opencontainers.image.url="https://github.com/onap/policy-clamp"
+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 http_proxy
 ARG https_proxy