UUI needs to use integration-java 11:9.0.0 image.

Issue-ID: USECASEUI-604
Change-Id: Id02ed5fa8e6fd30f199c80ee0ad6f08189c11074
Signed-off-by: hekeguang <hekeguang@chinamobile.com>

diff --git a/distribution/src/main/assembly/Dockerfile b/distribution/src/main/assembly/Dockerfile
index 3cb27b1..b92e275 100644 (file)
--- a/distribution/src/main/assembly/Dockerfile
+++ b/distribution/src/main/assembly/Dockerfile
@@ -1,20 +1,15 @@
-FROM ubuntu:16.04
+FROM nexus3.onap.org:10001/onap/integration-java11:9.0.0 
 
 EXPOSE 8443
 
-RUN apt-get update && \
-    apt-get install -y python-software-properties && \
-    apt-get install -y software-properties-common && \
-    add-apt-repository -y ppa:openjdk-r/ppa && \
-    apt-get update && \
-    apt-get install -y openjdk-11-jdk
+USER root
+RUN apk update && apk add shadow
+
 
 #configure the JDK
-RUN sed -i 's|#networkaddress.cache.ttl=-1|networkaddress.cache.ttl=10|' /usr/lib/jvm/java-11-openjdk-amd64/conf/security/java.security
-ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64
-ENV PATH $PATH:/usr/lib/jvm/java-11-openjdk-amd64/bin
+
 ENV CLASSPATH .:${JAVA_HOME}/lib:${JRE_HOME}/lib
-ENV JRE_HOME ${JAVA_HOME}
+
 
 #add uui gui related resources to the docker image
 RUN mkdir /home/uui
@@ -22,7 +17,7 @@ WORKDIR /home/uui
 ADD usecase-ui-*-linux64.tar.gz /home/uui/
 RUN chmod 755 /home/uui/*.sh
 
-RUN bash /home/uui/configEnv.sh
+RUN sh /home/uui/configEnv.sh
 USER uui
 WORKDIR /home/uui
 ENTRYPOINT /home/uui/startup.sh

diff --git a/distribution/src/main/assembly/configEnv.sh b/distribution/src/main/assembly/configEnv.sh
index b36855b..565557a 100644 (file)
--- a/distribution/src/main/assembly/configEnv.sh
+++ b/distribution/src/main/assembly/configEnv.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 #
 # Copyright 2020 CMCC Corporation.
 #

diff --git a/distribution/src/main/assembly/shutdown.sh b/distribution/src/main/assembly/shutdown.sh
index f3a97b3..1478c8d 100644 (file)
--- a/distribution/src/main/assembly/shutdown.sh
+++ b/distribution/src/main/assembly/shutdown.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
 #
 # Copyright 2017 ZTE Corporation.
 #

diff --git a/distribution/src/main/assembly/startup.sh b/distribution/src/main/assembly/startup.sh
index a964537..724c7f8 100644 (file)
--- a/distribution/src/main/assembly/startup.sh
+++ b/distribution/src/main/assembly/startup.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
 #
 # Copyright 2017 ZTE Corporation.
 #