diff options
| author |   Vijay Venkatesh Kumar <vv770d@att.com> | 2021-04-30 19:49:25 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2021-04-30 19:49:25 +0000 |
| commit | a08c407312730212d84233b1d8d6cc01683cd70a (patch) | |
| tree | aeb46267b5d646da4884f1b7ce34eef8bb943c0a | |
| parent | 595ae424f28de09d0ee0072a5926a284bca46691 (diff) | |
| parent | 1af9b08091d1a185781b9a7d06d20b78f70c1731 (diff) | |
Merge "Change bbs-e-p baseOS img to integration-"
| -rw-r--r-- | components/bbs-event-processor/Dockerfile | 18 | ||||
| -rw-r--r-- | components/bbs-event-processor/pom.xml | 2 | ||||
| -rw-r--r-- | components/bbs-event-processor/version.properties | 2 |
3 files changed, 13 insertions, 9 deletions
diff --git a/components/bbs-event-processor/Dockerfile b/components/bbs-event-processor/Dockerfile index a9e6a898..226d0b8c 100644 --- a/components/bbs-event-processor/Dockerfile +++ b/components/bbs-event-processor/Dockerfile @@ -1,24 +1,28 @@ -FROM openjdk:11-jre-slim +FROM nexus3.onap.org:10001/onap/integration-java11:8.0.0 ARG PROJECT_BUILD_DIR_NAME ARG FINAL_JAR ARG DEPENDENCIES_DIR ARG DOCKER_ARTIFACT_DIR +ARG user=bbs-ep +ARG group=bbs-ep + #Add a new user and group to allow container to be run as non-root -RUN addgroup --system bbs-ep && adduser --system --ingroup bbs-ep bbs-ep +USER root +RUN addgroup $group && adduser --system --disabled-password --no-create-home --ingroup $group $user #Copy dependencies and executable jar WORKDIR ${DOCKER_ARTIFACT_DIR} -COPY ${PROJECT_BUILD_DIR_NAME}/${FINAL_JAR} . -COPY KeyStore.jks . -COPY KeyStorePass.txt . +COPY --chown=${user}:${group} ${PROJECT_BUILD_DIR_NAME}/${FINAL_JAR} . +COPY --chown=${user}:${group} KeyStore.jks . +COPY --chown=${user}:${group} KeyStorePass.txt . #Overcome Docker limitation to put ARG inside ENTRYPOINT RUN ln -s ${FINAL_JAR} bbs-ep.jar -COPY ${PROJECT_BUILD_DIR_NAME}/${DEPENDENCIES_DIR} ./${DEPENDENCIES_DIR} +COPY --chown=${user}:${group} ${PROJECT_BUILD_DIR_NAME}/${DEPENDENCIES_DIR} ./${DEPENDENCIES_DIR} EXPOSE 8100 -USER bbs-ep:bbs-ep +USER ${user} ENTRYPOINT ["java", "-jar", "bbs-ep.jar"] diff --git a/components/bbs-event-processor/pom.xml b/components/bbs-event-processor/pom.xml index eb47fccb..f37dce5c 100644 --- a/components/bbs-event-processor/pom.xml +++ b/components/bbs-event-processor/pom.xml @@ -12,7 +12,7 @@ <groupId>org.onap.dcaegen2.services.components</groupId> <artifactId>bbs-event-processor</artifactId> - <version>2.1.0-SNAPSHOT</version> + <version>2.1.1-SNAPSHOT</version> <name>dcaegen2-services-bbs-event-processor</name> <description>BBS Re-Registration and CPE Authentication Handler</description> diff --git a/components/bbs-event-processor/version.properties b/components/bbs-event-processor/version.properties index 4b2b9f13..3c5fba7f 100644 --- a/components/bbs-event-processor/version.properties +++ b/components/bbs-event-processor/version.properties @@ -1,5 +1,5 @@ major=2 -minor=0 +minor=1 patch=1 base_version=${major}.${minor}.${patch} release_version=${base_version} |