diff --git a/contact-center/Dockerfile b/contact-center/Dockerfile index 404a8647..70bdb12d 100644 --- a/contact-center/Dockerfile +++ b/contact-center/Dockerfile @@ -1,5 +1,6 @@ -FROM ubuntu:18.04 +FROM chatopera/java-1.8.0-amazon-corretto-jdk:1.0.0 MAINTAINER Hai Liang Wang +# base image is built with config/base/build.sh ARG DEBIAN_FRONTEND=noninteractive ARG VCS_REF @@ -12,27 +13,6 @@ ENV APPLICATION_BUILD_DATESTR=$APPLICATION_BUILD_DATESTR LABEL org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-url="https://github.com/chatopera/cskefu" -# 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 - -# install other lib and configure timezone -RUN apt-get update && \ - apt-get install --no-install-recommends -y tzdata iputils-ping mysql-client-5.7 zip unzip vim-tiny libfontconfig1 libfreetype6 && \ - ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \ - DEBIAN_FRONTEND=noninteractive dpkg-reconfigure --frontend noninteractive tzdata && \ - rm -rf /var/lib/apt/lists/* - -# Set the locale -ENV LANG C.UTF-8 -ENV LANGUAGE en_US:en -ENV LC_ALL C.UTF-8 - -# set ENVs -ENV JAVA_HOME=/usr/lib/jvm/java-1.8.0-amazon-corretto -ENV PATH=$PATH:$JAVA_HOME/bin - # create dirs RUN /bin/bash -c "mkdir -p /{data,logs}" diff --git a/contact-center/config/base/Dockerfile b/contact-center/config/base/Dockerfile new file mode 100644 index 00000000..3949d1a0 --- /dev/null +++ b/contact-center/config/base/Dockerfile @@ -0,0 +1,25 @@ +FROM ubuntu:18.04 +MAINTAINER Hai Liang Wang + +ARG DEBIAN_FRONTEND=noninteractive + +# 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 + +# install other lib and configure timezone +RUN apt-get update && \ + apt-get install --no-install-recommends -y tzdata iputils-ping mysql-client-5.7 zip unzip vim-tiny libfontconfig1 libfreetype6 && \ + ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \ + DEBIAN_FRONTEND=noninteractive dpkg-reconfigure --frontend noninteractive tzdata && \ + rm -rf /var/lib/apt/lists/* + +# Set the locale +ENV LANG C.UTF-8 +ENV LANGUAGE en_US:en +ENV LC_ALL C.UTF-8 + +# set ENVs +ENV JAVA_HOME=/usr/lib/jvm/java-1.8.0-amazon-corretto +ENV PATH=$PATH:$JAVA_HOME/bin diff --git a/contact-center/assets/install-corretto-8.sh b/contact-center/config/base/assets/install-corretto-8.sh similarity index 100% rename from contact-center/assets/install-corretto-8.sh rename to contact-center/config/base/assets/install-corretto-8.sh diff --git a/contact-center/config/base/build.sh b/contact-center/config/base/build.sh new file mode 100755 index 00000000..41573c65 --- /dev/null +++ b/contact-center/config/base/build.sh @@ -0,0 +1,33 @@ +#! /bin/bash +########################################### +# +########################################### + +# constants +baseDir=$(cd `dirname "$0"`;pwd) +appHome=$baseDir +# registryName= +imagename=chatopera/java-1.8.0-amazon-corretto-jdk +PACKAGE_VERSION=1.0.0 +TIMESTAMP=`date "+%Y%m%d.%H%M%S"` + +# functions + +# main +[ -z "${BASH_SOURCE[0]}" -o "${BASH_SOURCE[0]}" = "$0" ] || return +# build +cd $appHome + +docker build --build-arg \ + --no-cache \ + --force-rm=true --tag $imagename:$PACKAGE_VERSION . + +set -x +if [ $? -eq 0 ]; then + docker tag $imagename:$PACKAGE_VERSION $imagename:develop + docker push $imagename:$PACKAGE_VERSION + docker push $imagename:develop +else + echo "Build contact-center failure." + exit 1 +fi \ No newline at end of file