Rollback to Ubuntu

Rollback to ubuntu as alpine seems to lead to issues due to font missing

Change-Id: Idca154725701d9bbdae70037a6c35842b5b95e2c
Issue-ID: CLAMP-361
Signed-off-by: sebdet <sebastien.determe@intl.att.com>

diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
index e59146c..20fdda8 100644 (file)
--- a/src/main/docker/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -1,7 +1,7 @@
-FROM openjdk:8u191-jdk-alpine3.9\r
+FROM ubuntu:16.04\r
 \r
 MAINTAINER "The Onap Team"\r
-LABEL Description="This immage contains alpine, openjdk 11 and clamp"\r
+LABEL Description="This immage contains an updated ubuntu 16.04 with the openjdk installed" Version="16.04-8"\r
 \r
 ARG http_proxy\r
 ARG https_proxy\r
@@ -10,7 +10,12 @@ ENV HTTPS_PROXY=$https_proxy
 ENV http_proxy=$HTTP_PROXY\r
 ENV https_proxy=$HTTPS_PROXY\r
 \r
-RUN addgroup onap && adduser -D -G onap clamp\r
+RUN test -n "$http_proxy" && echo "Acquire::Proxy \"http://$http_proxy\";" > /etc/apt/apt.conf.d/02proxy || true &&  \\r
+    apt-get update &&  \\r
+    apt-get -y dist-upgrade &&  \\r
+    apt-get install -y openjdk-8-jre-headless\r
+\r
+RUN groupadd -r onap && useradd --no-log-init -r -g onap clamp\r
 VOLUME /opt/clamp/config\r
 RUN mkdir /var/log/onap\r
 RUN chmod a+rwx /var/log/onap\r
@@ -20,8 +25,6 @@ RUN chmod 700 /opt/clamp/app.jar
 \r
 RUN chown -R clamp:onap /opt/clamp\r
 \r
-RUN apk add fontconfig\r
-\r
 USER clamp\r
 WORKDIR /opt/clamp/\r
 ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Xms256m", "-Xmx1g", "-jar" ,"./app.jar"]\r