From aa077ce4d358980b419f72734b2825c6a09cb814 Mon Sep 17 00:00:00 2001
From: xiangzi <187202822@qq.com>
Date: Mon, 27 Nov 2017 16:16:47 +0800
Subject: [PATCH] Update Dockerfile

---
 Dockerfile | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 295f9af..0da2269 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,26 +5,24 @@ RUN yum install -y epel-release \
  && yum update -y \
  && yum install -y wget gcc make apr apr-devel openssl openssl-devel
 
-ENV TOMCAT_VERSION=7.0.82 \
-    TOMCAT_MAJOR_VERSION=7 \
+ENV TOMCAT_MAJOR_VERSION=7 \
+    TOMCAT_VERSION=7.0.82 \
+    CATALINA_HOME=/opt/tomcat \
     JAVA_VERSION=7 \
     JAVA_UPDATE=80 \
     JAVA_BUILD=15 \
+    JAVA_HOME=/opt/jdk \
+    JRE_HOME=/opt/jdk/jre \
     LANG=en_US.UTF-8 \
-    JAVA_OPTS="-server -Xms1024m -Xmx1024m -Xss512K -XX:PermSize=128m -XX:MaxPermSize=256m -Djava.awt.headless=tru"    
-
-ENV TOMCAT_TGZ_URL=https://mirrors.cnnic.cn/apache/tomcat/tomcat-$TOMCAT_MAJOR_VERSION/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz
-ENV JAVA_HOME=/opt/jdk1.$JAVA_VERSION.0_$JAVA_UPDATE
-ENV JRE_HOME=$JAVA_HOME/jre
-ENV CATALINA_HOME=/opt/apache-tomcat-$TOMCAT_VERSION
-ENV PATH=$PATH:$JAVA_HOME/bin:$CATALINA_HOME/bin
-ENV CLASSPATH=.:$JAVA_HOME/lib/dt.jar:$JAVA_HOME/lib/tools.jar
-ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/apr/lib
+    LD_LIBRARY_PATH=:/usr/local/apr/lib \
+    JAVA_OPTS="-server -Xms1200m -Xmx1200m -Xss512k -XX:PermSize=128M -XX:MaxPermSize=256m -Djava.awt.headless=true"
 
 RUN wget -q http://apitest.healthlink.cn:9000/server-jre-${JAVA_VERSION}u${JAVA_UPDATE}-linux-x64.tar.gz -O /tmp/server-jre.tar.gz \
  && tar -zxf /tmp/server-jre.tar.gz -C /opt/ \
- && wget -q $TOMCAT_TGZ_URL -O /tmp/tomcat.tar.gz \
+ && mv /opt/jdk1.$JAVA_VERSION.0_$JAVA_UPDATE $JAVA_HOME \
+ && wget -q https://mirrors.cnnic.cn/apache/tomcat/tomcat-$TOMCAT_MAJOR_VERSION/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz -O /tmp/tomcat.tar.gz \
  && tar -zxf /tmp/tomcat.tar.gz -C /opt/ \
+ && mv /opt/apache-tomcat-$TOMCAT_VERSION $CATALINA_HOME \
  && rm -rf $CATALINA_HOME/webapps/* $JAVA_HOME/src.zip \
  && sed -i 's/securerandom\.source=file:\/dev\/urandom/securerandom\.source=file:\/dev\/\.\/urandom/' $JRE_HOME/lib/security/java.security \
  && tar -zxf $CATALINA_HOME/bin/tomcat-native.tar.gz -C /tmp \
@@ -33,14 +31,13 @@ RUN wget -q http://apitest.healthlink.cn:9000/server-jre-${JAVA_VERSION}u${JAVA_
  && make \
  && make install \
  && rpm -e --nodeps wget gcc make \
+ && chown -R nobody:nobody $CATALINA_HOME \
+ && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
  && yum clean all \
- && rm -rf /tmp/* /var/tmp/* /var/cache/yum/* \
- && useradd -Ms /bin/false tomcat \
- && chown -R tomcat:tomcat $CATALINA_HOME \
- && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+ && rm -rf /tmp/* /var/tmp/* /var/cache/yum/*
 
 EXPOSE 8080
 
 WORKDIR $CATALINA_HOME
-USER tomcat
-CMD ["catalina.sh","run"]
+USER nobody
+CMD ["bin/catalina.sh","run"]