aboutsummaryrefslogtreecommitdiffstats
path: root/datafile-app-server
diff options
context:
space:
mode:
authorJoeOLeary <joseph.o.leary@est.tech>2020-07-22 14:08:40 +0100
committerJoeOLeary <joseph.o.leary@est.tech>2020-07-23 16:59:59 +0100
commitb7a79dd0d1d5724a9d7658505fd974f788f95bfb (patch)
tree4e1fc2680236aa0f13138f4ebb837dac384eb133 /datafile-app-server
parenta4638a48f6b369c3913e464bd73a952427d74c4a (diff)
Update to Java 11
minor version bump to 1.4.0 Issue-ID: DCAEGEN2-1691 Signed-off-by: JoeOLeary <joseph.o.leary@est.tech> Change-Id: Iaf9e8fdcf469fe79c63e8e3868b18168a60a7f2c
Diffstat (limited to 'datafile-app-server')
-rw-r--r--datafile-app-server/pom.xml4
-rwxr-xr-x[-rw-r--r--]datafile-app-server/src/main/docker/Dockerfile6
2 files changed, 5 insertions, 5 deletions
diff --git a/datafile-app-server/pom.xml b/datafile-app-server/pom.xml
index 5f9474a0..fdec5992 100644
--- a/datafile-app-server/pom.xml
+++ b/datafile-app-server/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ ============LICENSE_START=======================================================
- ~ Copyright (C) 2018 NOKIA Intellectual Property, 2018-2019 Nordix Foundation. All rights reserved.
+ ~ Copyright (C) 2018 NOKIA Intellectual Property, 2018-2020 Nordix Foundation. All rights reserved.
~ Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.
~ ================================================================================
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -25,7 +25,7 @@
<parent>
<groupId>org.onap.dcaegen2.collectors</groupId>
<artifactId>datafile</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
</parent>
<groupId>org.onap.dcaegen2.collectors.datafile</groupId>
diff --git a/datafile-app-server/src/main/docker/Dockerfile b/datafile-app-server/src/main/docker/Dockerfile
index c3e5f07f..0763e2bf 100644..100755
--- a/datafile-app-server/src/main/docker/Dockerfile
+++ b/datafile-app-server/src/main/docker/Dockerfile
@@ -17,7 +17,7 @@
# SPDX-License-Identifier: Apache-2.0
# ============LICENSE_END=========================================================
#
-FROM openjdk:8-jre-alpine
+FROM openjdk:11.0.6-jre-slim
WORKDIR /opt/app/datafile
RUN mkdir -p /var/log/ONAP
@@ -28,10 +28,10 @@ ADD /config/application.yaml /opt/app/datafile/config/
EXPOSE 8100 8433
-RUN addgroup -S onap && adduser -S datafile -G onap
+RUN groupadd -r onap && useradd -ms /bin/bash datafile -g onap
RUN chown -R datafile:onap /var/log/ONAP
RUN chmod -R 777 /opt/app/datafile/config/
USER datafile
-ENTRYPOINT ["/usr/bin/java", "-jar", "/opt/app/datafile/datafile-app-server.jar"]
+ENTRYPOINT ["/usr/local/openjdk-11/bin/java", "-jar", "/opt/app/datafile/datafile-app-server.jar"]