|
@@ -6,11 +6,11 @@ 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.6.0_21.tar.gz \
|
|
|
+ && 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.6.0_21.tar.gz -C /usr/local/java/ \
|
|
|
&& tar -zxf web.tar.gz -C /app/ \
|
|
|
- && rm -f web.tar.gz jdk1.6.0_21.tar.gz \
|
|
|
+ && 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
|
|
@@ -20,8 +20,8 @@ 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.6.0_21/bin/* /usr/bin/ \
|
|
|
- && rsync -vzrtopg --progress $RELEASE/wapage2web_baidu.war /app/resin-pro-3.1.6/webapps/ROOT.war --password-file=/etc/rsyncd.wapage
|
|
|
+ && ln -s /usr/local/java/jdk1.8.0_191/bin/* /usr/bin/ \
|
|
|
+ && rsync -vzrtopg --progress $RELEASE/ads.war /app/resin-pro-3.1.6/webapps/ads.war --password-file=/etc/rsyncd.wapage
|
|
|
|
|
|
#start miscSearch
|
|
|
ENTRYPOINT ["entrypoint.sh"]
|