diff options
| -rw-r--r-- | packages/policy-api-docker/pom.xml | 24 | ||||
| -rw-r--r-- | packages/policy-api-docker/src/main/docker/Dockerfile | 11 | ||||
| -rw-r--r-- | packages/policy-api-docker/src/main/docker/suse.Dockerfile | 12 |
3 files changed, 43 insertions, 4 deletions
diff --git a/packages/policy-api-docker/pom.xml b/packages/policy-api-docker/pom.xml index 219aa48d..d9c47bb9 100644 --- a/packages/policy-api-docker/pom.xml +++ b/packages/policy-api-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-api-docker/src/main/docker/Dockerfile b/packages/policy-api-docker/src/main/docker/Dockerfile index ee315ed1..7fd6da9b 100644 --- a/packages/policy-api-docker/src/main/docker/Dockerfile +++ b/packages/policy-api-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) 2022 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. @@ -22,6 +23,14 @@ FROM onap/policy-jre-alpine:2.4.3 LABEL maintainer="Policy Team" +LABEL org.opencontainers.image.title="Policy API" +LABEL org.opencontainers.image.description="Policy API image based on Alpine" +LABEL org.opencontainers.image.url="https://github.com/onap/policy-api" +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/api @@ -43,4 +52,4 @@ RUN chown -R policy:policy * && chmod 755 bin/*.sh && chown -R policy:policy /ap USER policy WORKDIR $POLICY_HOME/bin -ENTRYPOINT [ "./policy-api.sh" ]
\ No newline at end of file +ENTRYPOINT [ "./policy-api.sh" ] diff --git a/packages/policy-api-docker/src/main/docker/suse.Dockerfile b/packages/policy-api-docker/src/main/docker/suse.Dockerfile index 67a73bbe..c855c3ab 100644 --- a/packages/policy-api-docker/src/main/docker/suse.Dockerfile +++ b/packages/policy-api-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) 2022 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. @@ -23,6 +21,14 @@ FROM opensuse/leap:15.3 LABEL maintainer="Policy Team" +LABEL org.opencontainers.image.title="Policy API" +LABEL org.opencontainers.image.description="Policy API image based on OpenSuse" +LABEL org.opencontainers.image.url="https://github.com/onap/policy-api" +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/api |