Browse Source

更新 'Dockerfile-basenew'

stone 5 years ago
parent
commit
3832fcb1cb
1 changed files with 6 additions and 5 deletions
  1. 6 5
      Dockerfile-basenew

+ 6 - 5
Dockerfile-basenew

@@ -1,8 +1,6 @@
-FROM hub.evbj.easou.com/dev/centos68-resin:3.1.16-jdk7
+FROM hub.evbj.easou.com/dev/centos:6.8
 MAINTAINER scofield[scofield_shi@easou.cn]
 
-COPY release /etc/release
-COPY resin.conf /app/soft/resin-pro-3.1.16/conf/resin.conf
 COPY entrypoint.sh /usr/bin/entrypoint.sh
 COPY rsyncd.wapage /etc/rsyncd.wapage
 COPY release /etc/release
@@ -12,8 +10,11 @@ RUN yum install -y rsync \
 	&& yum install -y vixie-cron \
 	&& yum install -y supervisor \
 	&& chmod +x /usr/bin/entrypoint.sh \
-	&& export RELEASE=`head -n 1 /etc/release` \
-	&& rsync -vzrtopg --progress $RELEASE/wapage2web_baidu.war /app/soft/resin-pro-3.1.16/webapps/ROOT.war --password-file=/etc/rsyncd.wapage
+	&& curl -O http://10.26.22.185:9000/psop/soft/misc.tar.gz \
+	&& curl -O http://10.26.22.185:9000/psop/soft/jdk-8u101-linux-x64.tar.gz \
+	&& tar -zxf jdk-8u101-linux-x64.tar.gz -C /usr/java/ \
+	&& tar zxf misc.tar.gz /app/
+
 
 COPY supervisord.conf /etc/supervisord.conf