From: Guangrong Fu <fu.guangrong@zte.com.cn>
Date: Sun, 3 Sep 2017 09:27:21 +0000 (+0800)
Subject: Change the alpine to ubuntu
X-Git-Tag: v1.0.0~50
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=holmes%2Fengine-management.git;a=commitdiff_plain;h=5c79091a81d6849ccbe3258af54e0f96851a07d2

Change the alpine to ubuntu

Change the image from alpine o ubuntu

Change-Id: Icde580dc16dda755a0f7a45e829e43e22d43af1e
Issue-ID: HOLMES-39
Signed-off-by: Guangrong Fu <fu.guangrong@zte.com.cn>
---

diff --git a/engine-d-standalone/src/main/assembly/Dockerfile b/engine-d-standalone/src/main/assembly/Dockerfile
index d7b7da7..120be3b 100644
--- a/engine-d-standalone/src/main/assembly/Dockerfile
+++ b/engine-d-standalone/src/main/assembly/Dockerfile
@@ -1,38 +1,23 @@
-FROM openresty/openresty:alpine
+FROM ubuntu:16.04
 
 MAINTAINER "Guangrong Fu" <fu.guangrong@zte.com.cn>
 
-#install java-1.8-openjdk
-
-ENV LANG C.UTF-8
-
-# add a simple script that can auto-detect the appropriate JAVA_HOME value
-# based on whether the JDK or only the JRE is installed
-RUN { \
-        echo '#!/bin/sh'; \
-        echo 'set -e'; \
-        echo; \
-        echo 'dirname "$(dirname "$(readlink -f "$(which javac || which java)")")"'; \
-    } > /usr/local/bin/docker-java-home \
-    && chmod +x /usr/local/bin/docker-java-home
-ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk
-ENV PATH $PATH:/usr/lib/jvm/java-1.8-openjdk/jre/bin:/usr/lib/jvm/java-1.8-openjdk/bin
-
-ENV JAVA_VERSION 8u131
-ENV JAVA_ALPINE_VERSION 8.131.11-r2
-
-RUN set -x \
-    && apk add --no-cache \
-        openjdk8="$JAVA_ALPINE_VERSION" \
-    && [ "$JAVA_HOME" = "$(docker-java-home)" ]
+#install openjdk-1.8
+#RUN sed -i 's#http://archive.ubuntu.com#http://mirrors.163.com#g' /etc/apt/sources.list
+RUN apt-get update
+RUN apt-get install -y openjdk-8-jdk wget
 
+#configure the JDK
+RUN sed -i 's|#networkaddress.cache.ttl=-1|networkaddress.cache.ttl=10|' /usr/lib/jvm/java-8-openjdk-amd64/jre/lib/security/java.security
+ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
+ENV PATH $PATH:/usr/lib/jvm/java-8-openjdk-amd64/jre/bin:/usr/lib/jvm/java-8-openjdk-amd64/bin
+ENV CLASSPATH .:${JAVA_HOME}/lib:${JRE_HOME}/lib
+ENV JRE_HOME ${JAVA_HOME}/jre
 
-#add activemq to the docker image
+#install ActiveMQ
 RUN mkdir /home/downloads
 RUN mkdir /home/activemq
 RUN cd /home/downloads
-RUN apt-get update
-RUN apt-get install -y wget
 RUN wget http://archive.apache.org/dist/activemq/apache-activemq/5.9.0/apache-activemq-5.9.0-bin.tar.gz
 RUN tar -xzvf apache-activemq-5.9.0-bin.tar.gz -C /home/activemq/
 RUN rm -rf /home/downloads
@@ -41,7 +26,7 @@ RUN rm -rf /home/downloads
 RUN mkdir /home/holmes
 WORKDIR /home/holmes
 ADD holmes-engine-d-standalone-*-linux64.tar.gz /home/holmes/
-
 RUN chmod 755 /home/holmes/bin/*.sh
 
+
 ENTRYPOINT /home/holmes/bin/run.sh