diff options
Diffstat (limited to 'dcae-analytics/dcae-analytics-tca-web')
| -rw-r--r-- | dcae-analytics/dcae-analytics-tca-web/Dockerfile | 35 | ||||
| -rw-r--r-- | dcae-analytics/dcae-analytics-tca-web/pom.xml | 3 |
2 files changed, 19 insertions, 19 deletions
diff --git a/dcae-analytics/dcae-analytics-tca-web/Dockerfile b/dcae-analytics/dcae-analytics-tca-web/Dockerfile index 411b6b1..2791e03 100644 --- a/dcae-analytics/dcae-analytics-tca-web/Dockerfile +++ b/dcae-analytics/dcae-analytics-tca-web/Dockerfile @@ -1,9 +1,4 @@ -# NOTE: This Dockerfile is auto generated and filtered via maven resources plugin. -# Edits to generated Dockerfile will NOT be saved. -# Only changes made in docker/Dockerfile template file will be persistent -# ========================================================================== - -FROM openjdk:11-jre-slim +FROM nexus3.onap.org:10001/onap/integration-java11:8.0.0 MAINTAINER Rajiv Singla <rs153v@att.com> @@ -11,22 +6,26 @@ ARG PROJECT_BUILD_DIR_NAME ARG FINAL_JAR ARG DEPENDENCIES_DIR ARG DOCKER_ARTIFACT_DIR +ARG user=tca-gen2 +ARG group=tca-gen2 -RUN mkdir -p /var/log/ONAP/dcaegen2/analytics/tca-gen2 -#Add a new user and group to allow container to be run as non-root -RUN groupadd tca-gen2 && useradd -g tca-gen2 tca-gen2; \ - chmod a+rwx /opt; \ - chmod a+rwx /var/log/ONAP/dcaegen2/analytics/tca-gen2; \ - chown -R tca-gen2:tca-gen2 /opt; \ - chown -R tca-gen2:tca-gen2 /var/log/ONAP/dcaegen2/analytics/tca-gen2 - -#Copy dependencies and executable jar WORKDIR ${DOCKER_ARTIFACT_DIR} +#Copy dependencies and executable jar COPY ${PROJECT_BUILD_DIR_NAME}/${FINAL_JAR} . -#Overcome Docker limitation to put ARG inside ENTRYPOINT -RUN ln -s ${FINAL_JAR} tca-gen2.jar + +USER root + +#Symlink to overcome Docker limitation to put ARG inside ENTRYPOINT +RUN mkdir -p /var/log/ONAP/dcaegen2/analytics/tca-gen2 && \ + addgroup $group && adduser --system --disabled-password --no-create-home --ingroup $group $user && \ + chmod g+rwx /opt; \ + chmod u+rw /var/log/ONAP/dcaegen2/analytics/tca-gen2 && \ + chown -R $user /opt && \ + chown -R $user /var/log/ONAP/dcaegen2/analytics/tca-gen2 && \ + ln -s ${FINAL_JAR} tca-gen2.jar && \ + chown $user ${FINAL_JAR} tca-gen2.jar EXPOSE 8100 -USER tca-gen2:tca-gen2 +USER $user ENTRYPOINT ["java", "-Dspring.profiles.active=configBindingService,dmaap,mongo", "-jar", "tca-gen2.jar"] diff --git a/dcae-analytics/dcae-analytics-tca-web/pom.xml b/dcae-analytics/dcae-analytics-tca-web/pom.xml index 3d4784d..86d332f 100644 --- a/dcae-analytics/dcae-analytics-tca-web/pom.xml +++ b/dcae-analytics/dcae-analytics-tca-web/pom.xml @@ -2,6 +2,7 @@ <!-- ~ ================================================================================ ~ Copyright (c) 2018-2020 AT&T Intellectual Property. All rights reserved. + ~ Copyright (c) 2021 Samsung Electronics. All rights reserved. ~ ================================================================================ ~ Modifications Copyright (C) 2019 IBM ~ ================================================================================ @@ -29,7 +30,7 @@ <parent> <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId> <artifactId>dcae-analytics</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> </parent> <artifactId>dcae-analytics-tca-web</artifactId> |