From: sebdet <sebastien.determe@intl.att.com>
Date: Mon, 29 Apr 2019 15:45:21 +0000 (+0200)
Subject: Rollback to Ubuntu
X-Git-Tag: 4.0.0~3
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=2924707c3f18125d6e058ec3bd5f58aff6cddce4;hp=2d526d7d2113a87ce7b6fbd47bca6f1536822da5;p=clamp.git

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