stone 4 rokov pred
rodič
commit
06f2853a6f
1 zmenil súbory, kde vykonal 21 pridanie a 17 odobranie
  1. 21 17
      Dockerfile-base

+ 21 - 17
Dockerfile-base

@@ -1,22 +1,26 @@
-FROM hub.evbj.easou.com/dev/nginx-1.15.5:1.0.0
-MAINTAINER stone[stone_shi@staff.easou.com]
+FROM hub.evbj.easou.com/dev/centos:6.8
+MAINTAINER scofield[scofield_shi@easou.cn]
 
+#install 
+RUN yum install -y wget rsync epel-release \
+	&& yum install -y vixie-cron \
+	&& yum install -y supervisor \
+	&& yum install -y nginx \
+	&& mkdir -p /usr/local/java  /app \
+	&& curl -O http://10.26.22.185:9000/psop/soft/jdk1.6.0_21.tar.gz \
+	&& tar -zxf jdk1.6.0_21.tar.gz -C /usr/local/java/ \ 
+	&& rm -f  jdk1.6.0_21.tar.gz \
+	&& rm -f /etc/nginx/nginx.conf
 
-ADD nginx.conf /app/soft/tengine/conf/nginx.conf
-ADD root /var/spool/cron/root
-ADD entrypoint.sh /usr/bin/entrypoint.sh
-ADD resin.ini /etc/supervisor/conf.d/resin.ini
-ADD rsyncd.wapage /etc/rsyncd.wapage
-ADD release /etc/release
+COPY entrypoint.sh /usr/bin/entrypoint.sh
+COPY release /etc/release 
+COPY supervisord.conf /etc/supervisord.conf
+COPY nginx.conf /etc/nginx/nginx.conf
 
-
-RUN yum install -y rsync \
-	&& chmod 600 /etc/rsyncd.wapage \
+RUN export RELEASE=`head -n 1 /etc/release` \
 	&& chmod +x /usr/bin/entrypoint.sh \
-	&& chmod +x /cron/root/nginxlog_cut.sh \
-	&& export RELEASE=`head -n 1 /etc/release` \
-	&& rsync -vzrtopg --progress $RELEASE/ROOT_com.war /app/soft/resin-pro-3.1.6/webapps/ROOT.war --password-file=/etc/rsyncd.wapage
- 
-#start resin
+	&& ln -s /usr/local/java/jdk1.6.0_21/bin/* /usr/bin/ \
+
+#start miscSearch
 ENTRYPOINT ["entrypoint.sh"]
-CMD ["/usr/bin/supervisord","-c", "/etc/supervisor/supervisord.conf"]
+CMD ["supervisord"]