Bladeren bron

[CI SKIP]

stone 3 jaren geleden
bovenliggende
commit
2593b66026
1 gewijzigde bestanden met toevoegingen van 6 en 14 verwijderingen
  1. 6 14
      Dockerfile

+ 6 - 14
Dockerfile

@@ -1,18 +1,7 @@
-FROM hub.evbj.easou.com/dev/centos:6.8
+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 \
-	&& mkdir -p /usr/local/java  /app \
-	&& curl -O http://10.26.22.185:9000/psop/soft/jdk1.8.0_191.tar.gz \
-	&& curl -O http://10.26.22.185:9000/psop/soft/web.tar.gz \
-	&& tar -zxf jdk1.8.0_191.tar.gz -C /usr/local/java/ \ 
-	&& tar -zxf web.tar.gz -C /app/ \
-	&& rm -f web.tar.gz jdk1.8.0_191.tar.gz \
-	&& rm -f /app/resin-pro-3.1.6/conf/resin.conf
-
 COPY entrypoint.sh /usr/bin/entrypoint.sh
 COPY release /etc/release 
 COPY supervisord.conf /etc/supervisord.conf
@@ -20,8 +9,11 @@ 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 \
-	&& ln -s /usr/local/java/jdk1.8.0_191/bin/* /usr/bin/ \
-	&& curl -O http://10.26.22.185:9000/psop/soft/ads.war /app/resin-pro-3.1.6/webapps/ads.war
+	&& curl -O http://10.26.22.185:9000/psop/soft/jdk1.8.0_191.tar.gz \
+	&& curl -O http://10.26.22.185:9000/psop/soft/ads.war /app/resin-pro-3.1.6/webapps/ads.war \
+	&& rm -f web.tar.gz jdk1.8.0_191.tar.gz \
+	&& ln -s /usr/local/java/jdk1.8.0_191/bin/* /usr/bin/
+	
 
 #start resin
 ENTRYPOINT ["entrypoint.sh"]