|
@@ -1,10 +1,28 @@
|
|
|
-FROM hub.evbj.easou.com/qa/wapage2web:v1base.0.1
|
|
|
+FROM hub.evbj.easou.com/dev/centos:6.8
|
|
|
MAINTAINER scofield[scofield_shi@easou.cn]
|
|
|
|
|
|
-COPY release /etc/release
|
|
|
+
|
|
|
+ENV JAVA_HOME /usr/java/jdk1.6.0_21
|
|
|
+
|
|
|
+#install
|
|
|
+RUN yum install -y wget rsync epel-release \
|
|
|
+ && yum install -y vixie-cron \
|
|
|
+ && useradd wapage \
|
|
|
+ && 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/web.tar.gz \
|
|
|
+ && tar -zxf jdk1.6.0_21.tar.gz -C /usr/local/java/ \
|
|
|
+ && tar -zxf misc.tar.gz -C /app/ \
|
|
|
+ && rm -f web.tar.gz jdk1.6.0_21.tar.gz
|
|
|
+
|
|
|
+COPY entrypoint.sh /usr/bin/entrypoint.sh
|
|
|
+COPY release /etc/release
|
|
|
+COPY supervisord.conf /etc/supervisord.conf
|
|
|
+
|
|
|
RUN 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
|
|
|
|
|
|
-#start resin
|
|
|
+#start miscSearch
|
|
|
ENTRYPOINT ["entrypoint.sh"]
|
|
|
-CMD ["/usr/bin/supervisord"]
|
|
|
+CMD ["supervisord"]
|