#191 set image as ubuntu 18.04, use amazon jdk

contact-center/163.source.list

@@ -1,5 +0,0 @@
-deb http://mirrors.163.com/ubuntu/ xenial main restricted universe multiverse
-deb http://mirrors.163.com/ubuntu/ xenial-security main restricted universe multiverse
-deb http://mirrors.163.com/ubuntu/ xenial-updates main restricted universe multiverse
-deb http://mirrors.163.com/ubuntu/ xenial-proposed main restricted universe multiverse
-deb http://mirrors.163.com/ubuntu/ xenial-backports main restricted universe multiverse

contact-center/Dockerfile

@@ -1,18 +1,26 @@
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 MAINTAINER Hai Liang Wang <hain@chatopera.com>
 
+ARG DEBIAN_FRONTEND=noninteractive
 ARG VCS_REF
 
 LABEL org.label-schema.vcs-ref=$VCS_REF \
           org.label-schema.vcs-url="https://github.com/chatopera/cosin"
 
-COPY 163.source.list /etc/apt/sources.list
+# COPY $PWD/assets/aliyun.sources.list /etc/apt/sources.list
+# install amazon jdk corretto
+COPY $PWD/assets/install-corretto-8.sh /opt
+RUN chmod +x /opt/install-corretto-8.sh && /opt/install-corretto-8.sh
 
-# Set timezone, install other sw as well
+# install maven
+COPY $PWD/assets/install-maven.sh /opt
+RUN chmod +x /opt/install-maven.sh && /opt/install-maven.sh
+
+# configure timezone
 RUN apt-get update && \
-   apt-get install --no-install-recommends -y tzdata openjdk-8-jdk maven && \ 
+   apt-get install --no-install-recommends -y tzdata && \ 
    ln -sf /usr/share/zoneinfo/Asia/Shanghai  /etc/localtime && \
-   dpkg-reconfigure -f noninteractive tzdata && \
+   DEBIAN_FRONTEND=noninteractive dpkg-reconfigure --frontend noninteractive tzdata && \
    rm -rf /var/lib/apt/lists/*
 
 # Set the locale
@@ -21,14 +29,13 @@ ENV LANGUAGE en_US:en
 ENV LC_ALL C.UTF-8
 
 # set ENVs
-ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
-ENV MAVEN_HOME=/usr/share/maven
+ENV JAVA_HOME=/usr/lib/jvm/java-1.8.0-amazon-corretto
+ENV MAVEN_HOME=/opt/maven
 ENV PATH=$PATH:$JAVA_HOME/bin:$MAVEN_HOME/bin
 
 # create dirs
 RUN /bin/bash -c "mkdir -p /{data,logs}"
 
-
 # build WAR
 COPY app /app
 COPY config /config
@@ -37,10 +44,8 @@ RUN mvn clean package && \
     mkdir -p /opt/chatopera && \
     mv target/contact-center-3.9.0.war /opt/chatopera && \
     rm -rf /app && rm -rf /config && \
-    rm -rf /root/.m2 && \
-    dpkg -P maven
+    rm -rf /root/.m2
 
 WORKDIR /opt/chatopera
 EXPOSE 8030-8050
 CMD ["java", "-jar", "contact-center-3.9.0.war"]
-

contact-center/app/pom.xml

@@ -266,11 +266,6 @@
             <artifactId>pinyin4j</artifactId>
             <version>2.5.0</version>
         </dependency>
-        <dependency>
-            <groupId>org.freeswitch.esl.client</groupId>
-            <artifactId>org.freeswitch.esl.client</artifactId>
-            <version>0.9.2</version>
-        </dependency>
         <dependency>
             <groupId>commons-collections</groupId>
             <artifactId>commons-collections</artifactId>

contact-center/assets/install-corretto-8.sh

@@ -0,0 +1,22 @@
+#! /bin/bash 
+###########################################
+#
+###########################################
+
+# constants
+baseDir=$(cd `dirname "$0"`;pwd)
+JDKNAME=java-1.8.0-amazon-corretto-jdk.deb
+# functions
+
+# main 
+[ -z "${BASH_SOURCE[0]}" -o "${BASH_SOURCE[0]}" = "$0" ] || return
+apt-get update && apt-get install -y --no-install-recommends publicsuffix ca-certificates wget java-common
+cd /tmp
+wget --no-check-certificate -O $JDKNAME https://d3pxv6yz143wms.cloudfront.net/8.212.04.2/java-1.8.0-amazon-corretto-jdk_8.212.04-2_amd64.deb
+dpkg --install $JDKNAME
+rm -rf $JDKNAME
+java -version
+
+export JAVA_HOME=/usr/lib/jvm/java-1.8.0-amazon-corretto
+export PATH=$PATH:$JAVA_HOME/bin
+rm -rf $0

contact-center/assets/install-maven.sh

@@ -0,0 +1,23 @@
+#! /bin/bash 
+###########################################
+#
+###########################################
+
+# constants
+export JAVA_HOME=/usr/lib/jvm/java-1.8.0-amazon-corretto
+export PATH=$PATH:$JAVA_HOME/bin
+baseDir=$(cd `dirname "$0"`;pwd)
+MVNNAME=maven.tgz
+
+# functions
+
+# main 
+[ -z "${BASH_SOURCE[0]}" -o "${BASH_SOURCE[0]}" = "$0" ] || return
+cd /opt && wget -O $MVNNAME https://www-us.apache.org/dist/maven/maven-3/3.6.1/binaries/apache-maven-3.6.1-bin.tar.gz
+tar xzf $MVNNAME
+mv apache-maven-* maven
+rm $MVNNAME
+
+export MAVEN_HOME=/opt/maven
+export PATH=$PATH:$MAVEN_HOME/bin
+rm -rf $0