summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiam Fallon <liam.fallon@est.tech>2022-06-30 10:11:04 +0000
committerGerrit Code Review <gerrit@onap.org>2022-06-30 10:11:04 +0000
commited439e7e8dafbdd87ace0604dc6230bb9563f995 (patch)
treef09756ca1355fedf504fc5743561fca40d34a2de
parent4e9c78dc19b2168b9f4781ad0b3da993b7489d48 (diff)
parent61c7e7795d2aa1ed321bd55e4637aa705e6e98ae (diff)
Merge "OCI image spec labels for models-simulator"
-rw-r--r--models-sim/packages/models-simulator-docker/pom.xml24
-rw-r--r--models-sim/packages/models-simulator-docker/src/main/docker/Dockerfile9
-rw-r--r--models-sim/packages/models-simulator-docker/src/main/docker/suse.Dockerfile8
3 files changed, 41 insertions, 0 deletions
diff --git a/models-sim/packages/models-simulator-docker/pom.xml b/models-sim/packages/models-simulator-docker/pom.xml
index c2d6df587..15daf003f 100644
--- a/models-sim/packages/models-simulator-docker/pom.xml
+++ b/models-sim/packages/models-simulator-docker/pom.xml
@@ -70,6 +70,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/models-sim/packages/models-simulator-docker/src/main/docker/Dockerfile b/models-sim/packages/models-simulator-docker/src/main/docker/Dockerfile
index 3bf466947..50f84d96c 100644
--- a/models-sim/packages/models-simulator-docker/src/main/docker/Dockerfile
+++ b/models-sim/packages/models-simulator-docker/src/main/docker/Dockerfile
@@ -4,6 +4,7 @@
# ================================================================================
# Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved.
# Modifications Copyright (C) 2020 Bell Canada. 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.
@@ -28,6 +29,14 @@
FROM onap/policy-jre-alpine:2.3.1
LABEL maintainer="Policy Team"
+LABEL org.opencontainers.image.title="Policy Models Simulator"
+LABEL org.opencontainers.image.description="Policy Models Simulator image based on Alpine"
+LABEL org.opencontainers.image.url="https://github.com/onap/policy-models"
+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/simulators
diff --git a/models-sim/packages/models-simulator-docker/src/main/docker/suse.Dockerfile b/models-sim/packages/models-simulator-docker/src/main/docker/suse.Dockerfile
index 3c1309a42..65e4783ab 100644
--- a/models-sim/packages/models-simulator-docker/src/main/docker/suse.Dockerfile
+++ b/models-sim/packages/models-simulator-docker/src/main/docker/suse.Dockerfile
@@ -27,6 +27,14 @@
FROM opensuse/leap:15.3
LABEL maintainer="Policy Team"
+LABEL org.opencontainers.image.title="Policy Models Simulator"
+LABEL org.opencontainers.image.description="Policy Models Simulator image based on OpenSuse"
+LABEL org.opencontainers.image.url="https://github.com/onap/policy-models"
+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/simulators