summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiam Fallon <liam.fallon@est.tech>2022-06-30 10:11:33 +0000
committerGerrit Code Review <gerrit@onap.org>2022-06-30 10:11:33 +0000
commit8cd2711cf5dcc52d88c62ea3f8b1ac7483af801b (patch)
treeb772e1991f9520510fb0ef79b11952ae4296c7ee
parent9b35a109a0ba7132ef78e1502a97bf45589520c2 (diff)
parent1ad06393d58e45f267e97033dbce69a57f1bf428 (diff)
Merge "OCI image spec labels for XACML-PDP"
-rw-r--r--packages/policy-xacmlpdp-docker/pom.xml24
-rw-r--r--packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile9
-rw-r--r--packages/policy-xacmlpdp-docker/src/main/docker/suse.Dockerfile8
3 files changed, 41 insertions, 0 deletions
diff --git a/packages/policy-xacmlpdp-docker/pom.xml b/packages/policy-xacmlpdp-docker/pom.xml
index aa849b6e..20f47f60 100644
--- a/packages/policy-xacmlpdp-docker/pom.xml
+++ b/packages/policy-xacmlpdp-docker/pom.xml
@@ -67,6 +67,30 @@
</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-xacmlpdp-docker/src/main/docker/Dockerfile b/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile
index 022c099e..dd76e509 100644
--- a/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile
+++ b/packages/policy-xacmlpdp-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.
@@ -21,6 +22,14 @@
FROM onap/policy-jre-alpine:2.4.3
LABEL maintainer="Policy Team"
+LABEL org.opencontainers.image.title="Policy XACML PDP"
+LABEL org.opencontainers.image.description="Policy XACML PDP image based on Alpine"
+LABEL org.opencontainers.image.url="https://github.com/onap/policy-xacml-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 POLICY_LOGS=/var/log/onap/policy/pdpx
diff --git a/packages/policy-xacmlpdp-docker/src/main/docker/suse.Dockerfile b/packages/policy-xacmlpdp-docker/src/main/docker/suse.Dockerfile
index 653f8e81..86e34ffb 100644
--- a/packages/policy-xacmlpdp-docker/src/main/docker/suse.Dockerfile
+++ b/packages/policy-xacmlpdp-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 XACML PDP"
+LABEL org.opencontainers.image.description="Policy XACML PDP image based on OpenSuse"
+LABEL org.opencontainers.image.url="https://github.com/onap/policy-xacml-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 POLICY_LOGS=/var/log/onap/policy/pdpx