aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSébastien Determe <sebastien.determe@intl.att.com>2019-11-19 13:32:39 +0000
committerGerrit Code Review <gerrit@onap.org>2019-11-19 13:32:39 +0000
commitfdd65e9703161a8598ea75a65f9adc93fcefc540 (patch)
treeae191e6379b6827b68c9c0708328b221f00e59c6
parentcfe18b62c2c3cfabdf4322b02c2e49e6ea284d3c (diff)
parente17bc1b801b50c1066414b30b21aa55236932284 (diff)
Merge "Rollback to JDK 11"
-rw-r--r--pom.xml4
-rw-r--r--src/main/docker/backend/Dockerfile4
2 files changed, 5 insertions, 3 deletions
diff --git a/pom.xml b/pom.xml
index 45459741a..83bc1d06e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1174,8 +1174,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
- <source>13</source>
- <target>13</target>
+ <source>11</source>
+ <target>11</target>
</configuration>
</plugin>
<plugin>
diff --git a/src/main/docker/backend/Dockerfile b/src/main/docker/backend/Dockerfile
index 625d5a9b9..776cc8c10 100644
--- a/src/main/docker/backend/Dockerfile
+++ b/src/main/docker/backend/Dockerfile
@@ -21,7 +21,7 @@
#
###
-FROM openjdk:13-alpine3.10
+FROM alpine:3.10
MAINTAINER "The Onap Team"
LABEL Description="This immage contains alpine, openjdk 11 and clamp"
@@ -33,6 +33,8 @@ ENV HTTPS_PROXY=$https_proxy
ENV http_proxy=$HTTP_PROXY
ENV https_proxy=$HTTPS_PROXY
+RUN apk --no-cache add openjdk11 --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community
+
RUN addgroup onap && adduser -D -G onap clamp
VOLUME /opt/clamp/config
RUN mkdir /var/log/onap