优化java-nodejs，默认安装supervisord

ci-webhook/tomcat/Dockerfile

@@ -18,3 +18,6 @@ RUN cd ci-webhook && npm install
 COPY server.js /root/ci-webhook/server.js
 
 COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+
+# Define default command.
+CMD ["/usr/bin/supervisord"]

java-nodejs/README.md

@@ -1,6 +1,11 @@
 # Java+NodeJS
 
-Java+NodeJS运行环境
+基于 [ubuntuut](https://dev.aliyun.com/detail.html?repoId=25237) 镜像，安装Java+NodeJS环境。
+
+其他包:
+
+* supervisord
+* cnpm、pm2
 
 
 

java-nodejs/jre7-node7/Dockerfile

@@ -6,10 +6,16 @@ RUN apt-get update && \
     apt-get install -y python-software-properties software-properties-common
 
 RUN curl -sL https://deb.nodesource.com/setup_7.x | sudo -E bash -
-RUN apt-get install nodejs
+RUN apt-get install nodejs && \
+    apt-get install -y inetutils-ping net-tools dnsutils supervisor        
 RUN apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
 # add cnpm for taobao registry
-RUN npm install -g cnpm child_process pm2 --registry=https://registry.npm.taobao.org
+RUN npm install -g cnpm pm2 --registry=https://registry.npm.taobao.org
+
+COPY ../supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+
+# Define default command.
+CMD ["/usr/bin/supervisord"]
 

java-nodejs/supervisord.conf

@@ -0,0 +1,3 @@
+[supervisord]
+nodaemon=true
+