|
@@ -1,21 +1,12 @@
|
|
|
-FROM hub.evbj.easou.com/qa/wapage2web:v1base.0.11
|
|
|
+FROM hub.evbj.easou.com/qa/wapage2web:v1base1.0.0
|
|
|
MAINTAINER scofield[scofield_shi@easou.cn]
|
|
|
|
|
|
#update release version
|
|
|
COPY release /etc/release
|
|
|
-COPY supervisord.conf /etc/supervisord.conf
|
|
|
-COPY entrypoint.sh /usr/bin/entrypoint.sh
|
|
|
+
|
|
|
|
|
|
RUN export RELEASE=`head -n 1 /etc/release` \
|
|
|
- && useradd wapage \
|
|
|
- && curl -O http://10.26.22.185:9000/psop/soft/miscSearch.tar \
|
|
|
- && mkdir /app/wapage \
|
|
|
- && tar -xf miscSearch.tar -C /app/wapage/ \
|
|
|
- && rm -f miscSearch.tar /app/wapage/miscSearch/start.sh \
|
|
|
- && 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
|
|
|
-COPY start.sh /app/wapage/miscSearch/start.sh
|
|
|
|
|
|
|
|
|
|