diff options
| author |   danielhanrahan <daniel.hanrahan@est.tech> | 2022-06-28 11:34:31 +0100 |
|---|---|---|
| committer | Daniel Hanrahan <daniel.hanrahan@est.tech> | 2022-06-29 08:46:08 +0000 |
| commit | f09c6818f6ee2d0a7c975d785a6851f3e27c7a1d (patch) | |
| tree | 822e849d40ac6f970aa4ffa95682deaf66d6cb6a | |
| parent | 6bd57ed2174e249a60b75d5a9c8ba2bbc1060563 (diff) | |
OCI image spec labels for PAP
Issue-ID: POLICY-4254
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: Ide30dc437f25846b569b5f4ac9a581880705a7c4
| -rw-r--r-- | packages/policy-pap-docker/pom.xml | 24 | ||||
| -rw-r--r-- | packages/policy-pap-docker/src/main/docker/Dockerfile | 9 | ||||
| -rw-r--r-- | packages/policy-pap-docker/src/main/docker/suse.Dockerfile | 12 |
3 files changed, 42 insertions, 3 deletions
diff --git a/packages/policy-pap-docker/pom.xml b/packages/policy-pap-docker/pom.xml index 04f6ab4f..4a180cd8 100644 --- a/packages/policy-pap-docker/pom.xml +++ b/packages/policy-pap-docker/pom.xml @@ -66,6 +66,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-pap-docker/src/main/docker/Dockerfile b/packages/policy-pap-docker/src/main/docker/Dockerfile index 7fad1a39..e4a8ca3c 100644 --- a/packages/policy-pap-docker/src/main/docker/Dockerfile +++ b/packages/policy-pap-docker/src/main/docker/Dockerfile @@ -3,6 +3,7 @@ # ============LICENSE_START======================================================= # Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved. # Modifications Copyright (C) 2021 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. @@ -23,6 +24,14 @@ FROM onap/policy-jre-alpine:2.4.3 LABEL maintainer="Policy Team" +LABEL org.opencontainers.image.title="Policy PAP" +LABEL org.opencontainers.image.description="Policy PAP image based on Alpine" +LABEL org.opencontainers.image.url="https://github.com/onap/policy-pap" +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/pap diff --git a/packages/policy-pap-docker/src/main/docker/suse.Dockerfile b/packages/policy-pap-docker/src/main/docker/suse.Dockerfile index d9957d11..f3a6dc41 100644 --- a/packages/policy-pap-docker/src/main/docker/suse.Dockerfile +++ b/packages/policy-pap-docker/src/main/docker/suse.Dockerfile @@ -1,9 +1,7 @@ #------------------------------------------------------------------------------- # Dockerfile # ============LICENSE_START======================================================= -# Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved. -# Modifications Copyright (C) 2021 Bell Canada. All rights reserved. -# Modifications Copyright (C) 2022 Nordix Foundation. +# 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. @@ -24,6 +22,14 @@ FROM opensuse/leap:15.3 LABEL maintainer="Policy Team" +LABEL org.opencontainers.image.title="Policy PAP" +LABEL org.opencontainers.image.description="Policy PAP image based on OpenSuse" +LABEL org.opencontainers.image.url="https://github.com/onap/policy-pap" +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/pap |