diff options
author | danielhanrahan <daniel.hanrahan@est.tech> | 2022-06-28 11:45:15 +0100 |
---|---|---|
committer | danielhanrahan <daniel.hanrahan@est.tech> | 2022-06-28 11:45:15 +0100 |
commit | a7309ed8c8e9115fdd44b83b2505df5a11b06093 (patch) | |
tree | 89021c6ab88f31a74ac26cc6868bfb5ff480df07 | |
parent | 3b9e1d6eff05e0523c43f066a3e0a7e70025352f (diff) |
OCI image spec labels for APEX-PDP
Issue-ID: POLICY-4255
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: Iedd26861fe66d5cd11d168c9e6534a7c04676a42
-rw-r--r-- | packages/apex-pdp-docker/pom.xml | 27 | ||||
-rw-r--r-- | packages/apex-pdp-docker/src/main/docker/Dockerfile | 10 | ||||
-rw-r--r-- | packages/apex-pdp-docker/src/main/docker/suse.Dockerfile | 8 |
3 files changed, 44 insertions, 1 deletions
diff --git a/packages/apex-pdp-docker/pom.xml b/packages/apex-pdp-docker/pom.xml index 23c8b1075..ed5733bb5 100644 --- a/packages/apex-pdp-docker/pom.xml +++ b/packages/apex-pdp-docker/pom.xml @@ -3,6 +3,7 @@ Copyright (C) 2018 Ericsson. All rights reserved. Modifications Copyright (C) 2019-2020 Bell Canada. Modifications Copyright (C) 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. @@ -61,6 +62,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> @@ -128,6 +154,7 @@ </execution> </executions> </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> diff --git a/packages/apex-pdp-docker/src/main/docker/Dockerfile b/packages/apex-pdp-docker/src/main/docker/Dockerfile index b788c7fbd..d8b547760 100644 --- a/packages/apex-pdp-docker/src/main/docker/Dockerfile +++ b/packages/apex-pdp-docker/src/main/docker/Dockerfile @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------- # ============LICENSE_START======================================================= -# Copyright (C) 2020 Nordix Foundation. +# Copyright (C) 2020-2022 Nordix Foundation. # Modification Copyright (C) 2020-2021 AT&T Foundation. # Modifications Copyright (C) 2021 Bell Canada. # ================================================================================ @@ -26,6 +26,14 @@ FROM onap/policy-jdk-alpine:2.4.3 LABEL maintainer="Policy Team" +LABEL org.opencontainers.image.title="Policy APEX PDP" +LABEL org.opencontainers.image.description="Policy APEX PDP image based on Alpine" +LABEL org.opencontainers.image.url="https://github.com/onap/policy-apex-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/apex-pdp ENV POLICY_HOME=/opt/app/policy/apex-pdp diff --git a/packages/apex-pdp-docker/src/main/docker/suse.Dockerfile b/packages/apex-pdp-docker/src/main/docker/suse.Dockerfile index 653760cd6..aecfaf7dd 100644 --- a/packages/apex-pdp-docker/src/main/docker/suse.Dockerfile +++ b/packages/apex-pdp-docker/src/main/docker/suse.Dockerfile @@ -24,6 +24,14 @@ FROM opensuse/leap:15.3 LABEL maintainer="Policy Team" +LABEL org.opencontainers.image.title="Policy APEX PDP" +LABEL org.opencontainers.image.description="Policy APEX PDP image based on OpenSuse" +LABEL org.opencontainers.image.url="https://github.com/onap/policy-apex-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/apex-pdp ENV POLICY_HOME=/opt/app/policy/apex-pdp |