From: Guangrong Fu <fu.guangrong@zte.com.cn>
Date: Sun, 3 Sep 2017 09:26:11 +0000 (+0800)
Subject: Change the alpine to ubuntu
X-Git-Tag: v1.0.0~60
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F01%2F10101%2F1;p=holmes%2Frule-management.git

Change the alpine to ubuntu

Change the image from alpine o ubuntu

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

diff --git a/rulemgt-standalone/src/main/assembly/Dockerfile b/rulemgt-standalone/src/main/assembly/Dockerfile
index e91ec7c..2be3e4e 100644
--- a/rulemgt-standalone/src/main/assembly/Dockerfile
+++ b/rulemgt-standalone/src/main/assembly/Dockerfile
@@ -1,48 +1,26 @@
-FROM openresty/openresty:alpine
+FROM ubuntu:16.04
 
 MAINTAINER "Guangrong Fu" <fu.guangrong@zte.com.cn>
 
-#install java-1.8-openjdk
+#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
 
-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)" ]
+#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 holmes related resources to the docker image
-
 RUN mkdir /home/holmes
-
 WORKDIR /home/holmes
-
 ADD holmes-rulemgt-standalone-*-linux64.tar.gz /home/holmes/
-
-#RUN apt-get update
-
-#RUN apt-get install unzip
-
-#RUN unzip -qo holmes-rulemgt-standalone-*-linux64.zip -d .
-
 RUN chmod 755 /home/holmes/bin/*.sh
 
+#RUN apt-get install -y mysql-client
 
 ENTRYPOINT /home/holmes/bin/run.sh
 
-