aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordanielhanrahan <daniel.hanrahan@est.tech>2022-06-28 14:24:28 +0100
committerDaniel Hanrahan <daniel.hanrahan@est.tech>2022-06-29 08:43:13 +0000
commit1b026df8ba5a1e9d9d39ca2e31d441cb68dcb03a (patch)
tree28359e531548a08aed264e18a1d7e217d127916f
parent1cf652918fc34ec930547762f82b99bb5df8323b (diff)
OCI image spec labels for drools-apps
Issue-ID: POLICY-4258 Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech> Change-Id: I4066c59c0577082848a8127c2bc4a1f99fb89ca5
-rw-r--r--controlloop/packages/docker-controlloop/pom.xml26
-rw-r--r--controlloop/packages/docker-controlloop/src/main/docker/Dockerfile11
2 files changed, 37 insertions, 0 deletions
diff --git a/controlloop/packages/docker-controlloop/pom.xml b/controlloop/packages/docker-controlloop/pom.xml
index 09f3d0e6d..58b084e15 100644
--- a/controlloop/packages/docker-controlloop/pom.xml
+++ b/controlloop/packages/docker-controlloop/pom.xml
@@ -4,6 +4,7 @@
================================================================================
Copyright (C) 2019-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.
@@ -64,6 +65,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>
+
<!--fabric8.io docker-maven-plugin does not support ARG usage in the FROM statement of Dockerfile
even though docker supports it: https://github.com/fabric8io/docker-maven-plugin/issues/859.
As a workaround we shall use maven-antrun-plugin to copy the Dockerfile and apply filters to
diff --git a/controlloop/packages/docker-controlloop/src/main/docker/Dockerfile b/controlloop/packages/docker-controlloop/src/main/docker/Dockerfile
index e236f8b4f..424a24b11 100644
--- a/controlloop/packages/docker-controlloop/src/main/docker/Dockerfile
+++ b/controlloop/packages/docker-controlloop/src/main/docker/Dockerfile
@@ -2,6 +2,7 @@
# Dockerfile
# ============LICENSE_START=======================================================
# Copyright (C) 2020 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,16 @@
FROM onap/policy-drools:@version.policy.drools-pdp@
+LABEL maintainer="Policy Team"
+LABEL org.opencontainers.image.title="Policy Drools Applications"
+LABEL org.opencontainers.image.description="Policy Drools Applications image"
+LABEL org.opencontainers.image.url="https://github.com/onap/policy-drools-applications"
+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_APP_CL=${BUILD_VERSION_APP_CL}
ENV BUILD_VERSION_APP_CL=${BUILD_VERSION_APP_CL}