stone преди 3 години
родител
ревизия
34c76dc231
променени са 1 файла, в които са добавени 4 реда и са изтрити 11 реда
  1. 4 11
      Dockerfile

+ 4 - 11
Dockerfile

@@ -1,21 +1,14 @@
-FROM hub.evbj.easou.com/dev/centos68-resin:3.1.16-jdk8
+FROM hub.evbj.easou.com/qa/wapage2web:v1.0.00
 MAINTAINER scofield[scofield_shi@easou.cn]
 
-#install 
-RUN yum install -y wget rsync epel-release \
-	&& yum install -y vixie-cron \
-	&& yum install -y supervisor \curl -O http://10.26.22.185:9000/psop/soft/ads.war /app/resin-pro-3.1.6/webapps/ads.war \
-	&& rm -f /app/resin-pro-3.1.6/conf/resin.conf
-
+ENV TZ=Asia/Shanghai
+RUN curl -O http://10.26.22.185:9000/psop/soft/ads.war /app/resin-pro-3.1.6/webapps/ads.war \
+	&& rm -f /app/resin-pro-3.1.6/conf/resin.conf /etc/supervisord.conf
 COPY entrypoint.sh /usr/bin/entrypoint.sh
 COPY release /etc/release 
 COPY supervisord.conf /etc/supervisord.conf
 COPY resin.conf /app/resin-pro-3.1.6/conf/resin.conf
 
-RUN export RELEASE=`head -n 1 /etc/release` \
-	&& chmod +x /usr/bin/entrypoint.sh \
-	
-
 #start resin
 ENTRYPOINT ["entrypoint.sh"]
 CMD ["supervisord"]