From: sebdet <sebastien.determe@intl.att.com>
Date: Mon, 29 Apr 2019 16:19:39 +0000 (+0200)
Subject: Return to alpine
X-Git-Tag: 4.0.0~2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=c7e23eae162aa059bea8c9d13556d3931520f17b;p=clamp.git

Return to alpine

Add missing library to alpine so the Font libraries can be found by the
JVM

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

diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
index 20fdda87..c47d6229 100644
--- a/src/main/docker/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -1,7 +1,7 @@
-FROM ubuntu:16.04
+FROM openjdk:8u191-jdk-alpine3.9
 
 MAINTAINER "The Onap Team"
-LABEL Description="This immage contains an updated ubuntu 16.04 with the openjdk installed" Version="16.04-8"
+LABEL Description="This immage contains alpine, openjdk 11 and clamp"
 
 ARG http_proxy
 ARG https_proxy
@@ -10,12 +10,7 @@ ENV HTTPS_PROXY=$https_proxy
 ENV http_proxy=$HTTP_PROXY
 ENV https_proxy=$HTTPS_PROXY
 
-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
+RUN addgroup onap && adduser -D -G onap clamp
 VOLUME /opt/clamp/config
 RUN mkdir /var/log/onap
 RUN chmod a+rwx /var/log/onap
@@ -25,6 +20,15 @@ RUN chmod 700 /opt/clamp/app.jar
 
 RUN chown -R clamp:onap /opt/clamp
 
+RUN apk add fontconfig
+RUN apk add ttf-dejavu
+
+RUN ln -s /usr/lib/libfontconfig.so.1 /usr/lib/libfontconfig.so && \
+  ln -s /lib/libuuid.so.1 /usr/lib/libuuid.so.1 && \
+  ln -s /lib/libc.musl-x86_64.so.1 /usr/lib/libc.musl-x86_64.so.1
+
+ENV LD_LIBRARY_PATH /usr/lib
+
 USER clamp
 WORKDIR /opt/clamp/
 ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Xms256m", "-Xmx1g", "-jar" ,"./app.jar"]