|
@@ -1,9 +1,7 @@
|
|
FROM hub.evbj.easou.com/pro/dashouye:1.0.1
|
|
FROM hub.evbj.easou.com/pro/dashouye:1.0.1
|
|
MAINTAINER guizhong[guizhong_liu@staff.easou.com]
|
|
MAINTAINER guizhong[guizhong_liu@staff.easou.com]
|
|
|
|
|
|
-#RUN rm -rf /app/soft/resin-pro-3.1.6/webapps/*
|
|
|
|
-#RUN wget -qO /app/soft/resin-pro-3.1.6/webapps/ROOT.war ${JNLP_WAR}
|
|
|
|
-#RUN wget -O /app/soft/resin-pro-3.1.6/webapps/ROOT.war http://10.26.22.185:9000/psop/soft/dashouye.war
|
|
|
|
|
|
+
|
|
ADD resin.conf /app/soft/resin-pro-3.1.6/conf/resin.conf
|
|
ADD resin.conf /app/soft/resin-pro-3.1.6/conf/resin.conf
|
|
ADD flume.conf /app/soft/flume/conf/flume.conf
|
|
ADD flume.conf /app/soft/flume/conf/flume.conf
|
|
ADD nginxlog_cut.sh /cron/root/nginxlog_cut.sh
|
|
ADD nginxlog_cut.sh /cron/root/nginxlog_cut.sh
|
|
@@ -13,11 +11,17 @@ ADD root /var/spool/cron/root
|
|
ADD entrypoint.sh /usr/bin/entrypoint.sh
|
|
ADD entrypoint.sh /usr/bin/entrypoint.sh
|
|
ADD resin.ini /etc/supervisor/conf.d/resin.ini
|
|
ADD resin.ini /etc/supervisor/conf.d/resin.ini
|
|
ADD rsyncd.wapage /etc/rsyncd.wapage
|
|
ADD rsyncd.wapage /etc/rsyncd.wapage
|
|
|
|
+ADD release /etc/release
|
|
|
|
+
|
|
|
|
+
|
|
RUN yum install -y rsync \
|
|
RUN yum install -y rsync \
|
|
|
|
+ && rm -rf /data/project/* \
|
|
&& chmod 600 /etc/rsyncd.wapage \
|
|
&& chmod 600 /etc/rsyncd.wapage \
|
|
&& chmod +x /usr/bin/entrypoint.sh \
|
|
&& chmod +x /usr/bin/entrypoint.sh \
|
|
&& chmod +x /cron/root/nginxlog_cut.sh \
|
|
&& chmod +x /cron/root/nginxlog_cut.sh \
|
|
- && rsync -vzrtopg --progress 10.26.22.190::release/search-wapage/prod-64/new_index_search/1.0.126/new_index_search_1.0.126_addBadMessageReport_T1.0.125-191181_1.0.126_20200509-171007_RBL/ROOT_com.war /data/project/ --password-file=/etc/rsyncd.wapage
|
|
|
|
|
|
+ && export RELEASE=`head -n 1 /etc/release` \
|
|
|
|
+ && rsync -vzrtopg --progress $RELEASE/ROOT_com.war /data/project/ROOT.war --password-file=/etc/rsyncd.wapage \
|
|
|
|
+ && chown root:root /data/project/ROOT.war
|
|
|
|
|
|
#start resin
|
|
#start resin
|
|
ENTRYPOINT ["entrypoint.sh"]
|
|
ENTRYPOINT ["entrypoint.sh"]
|