Merge branch 'master' of https://git.hudongtang.cn/chenhuan/docker

base-images/java/Dockerfile

@@ -20,10 +20,23 @@ RUN apt-get update && apt-get install -y tzdata && apt-get  install -y zip
 
 ENV TZ=Asia/Shanghai
 
+#RUN apt-get install -y openjdk-8-jre
 
-MAINTAINER chenhuan <chenhuan@hudongtang.cn>
+
+#set oracle jdk environment
 RUN mkdir /usr/local/java
 ADD jre1.8.0_291/ /usr/local/java
-ENV JAVA_HOME /usr/local/java/
-ENV PATH ${PATH}:${JAVA_HOME}/bin
+
+ENV JAVA_HOME=/usr/local/java/jdk1.8.0_291
+ENV JRE_HOME=${JAVA_HOME}/jre  
+ENV CLASSPATH=.:${JAVA_HOME}/lib:${JRE_HOME}/lib  
+ENV PATH=${JAVA_HOME}/bin:$PATH 
+
+
+
+# MAINTAINER chenhuan <chenhuan@hudongtang.cn>
+# RUN mkdir /usr/local/java
+# ADD jre1.8.0_291/ /usr/local/java
+# ENV JAVA_HOME /usr/local/java/
+# ENV PATH ${PATH}:${JAVA_HOME}/bin
 

base-images/nginx-php-fpm-main/Dockerfile

@@ -298,11 +298,11 @@ RUN echo "cgi.fix_pathinfo=0" > ${php_vars} &&\
     echo "memory_limit = 1028M"  >> ${php_vars} && \
     sed -i \
         -e "s/;catch_workers_output\s*=\s*yes/catch_workers_output = yes/g" \
-        -e "s/pm.max_children = 5/pm.max_children = 4/g" \
-        -e "s/pm.start_servers = 2/pm.start_servers = 3/g" \
-        -e "s/pm.min_spare_servers = 1/pm.min_spare_servers = 2/g" \
-        -e "s/pm.max_spare_servers = 3/pm.max_spare_servers = 4/g" \
-        -e "s/;pm.max_requests = 500/pm.max_requests = 200/g" \
+        -e "s/pm.max_children = 5/pm.max_children = 40/g" \
+        -e "s/pm.start_servers = 2/pm.start_servers = 5/g" \
+        -e "s/pm.min_spare_servers = 1/pm.min_spare_servers = 4/g" \
+        -e "s/pm.max_spare_servers = 3/pm.max_spare_servers = 6/g" \
+        -e "s/;pm.max_requests = 500/pm.max_requests = 500/g" \
         -e "s/user = www-data/user = nginx/g" \
         -e "s/group = www-data/group = nginx/g" \
         -e "s/;listen.mode = 0660/listen.mode = 0666/g" \