stone 3 лет назад
Родитель
Сommit
3572f24683
1 измененных файлов с 1 добавлено и 10 удалено
  1. 1 10
      Dockerfile

+ 1 - 10
Dockerfile

@@ -1,17 +1,9 @@
-FROM hub.evbj.easou.com/dev/centos:6.8
+FROM hub.evbj.easou.com/dev/dev/centos68-resin:3.1.16-jdk8
 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/ \
 	&& 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 \
 	&& rm -f /app/resin-pro-3.1.6/conf/resin.conf
 
 COPY entrypoint.sh /usr/bin/entrypoint.sh
@@ -21,7 +13,6 @@ 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/ 
 	
 
 #start resin