|
@@ -4,6 +4,7 @@ MAINTAINER scofield[scofield_shi@easou.cn]
|
|
#update release version
|
|
#update release version
|
|
COPY release /etc/release
|
|
COPY release /etc/release
|
|
COPY supervisord.conf /etc/supervisord.conf
|
|
COPY supervisord.conf /etc/supervisord.conf
|
|
|
|
+COPY entrypoint.sh /usr/bin/entrypoint.sh
|
|
|
|
|
|
RUN export RELEASE=`head -n 1 /etc/release` \
|
|
RUN export RELEASE=`head -n 1 /etc/release` \
|
|
&& curl -O http://10.26.22.185:9000/psop/soft/miscSearch.tar \
|
|
&& curl -O http://10.26.22.185:9000/psop/soft/miscSearch.tar \
|
|
@@ -11,9 +12,10 @@ RUN export RELEASE=`head -n 1 /etc/release` \
|
|
&& tar -xf miscSearch.tar -C /app/wapage/ \
|
|
&& tar -xf miscSearch.tar -C /app/wapage/ \
|
|
&& rm -f miscSearch.tar /app/wapage/miscSearch/start.sh \
|
|
&& rm -f miscSearch.tar /app/wapage/miscSearch/start.sh \
|
|
&& ln -s /usr/local/java/jdk1.6.0_21/bin/* /usr/bin/ \
|
|
&& ln -s /usr/local/java/jdk1.6.0_21/bin/* /usr/bin/ \
|
|
|
|
+ && && chmod +x /usr/bin/entrypoint.sh \
|
|
&& rsync -vzrtopg --progress $RELEASE/wapage2web_baidu.war /app/resin-pro-3.1.6/webapps/ROOT.war --password-file=/etc/rsyncd.wapage
|
|
&& rsync -vzrtopg --progress $RELEASE/wapage2web_baidu.war /app/resin-pro-3.1.6/webapps/ROOT.war --password-file=/etc/rsyncd.wapage
|
|
COPY start.sh /app/wapage/miscSearch/start.sh
|
|
COPY start.sh /app/wapage/miscSearch/start.sh
|
|
-COPY entrypoint.sh /usr/bin/entrypoint.sh
|
|
|
|
|
|
+
|
|
|
|
|
|
|
|
|
|
#start resin
|
|
#start resin
|