|
@@ -4,7 +4,6 @@ MAINTAINER scofield[scofield_shi@easou.cn]
|
|
|
COPY release /etc/release
|
|
|
COPY resin.conf /app/soft/resin-pro-3.1.16/conf/resin.conf
|
|
|
COPY entrypoint.sh /usr/bin/entrypoint.sh
|
|
|
-COPY resin.ini /etc/supervisor/conf.d/resin.ini
|
|
|
COPY rsyncd.wapage /etc/rsyncd.wapage
|
|
|
COPY release /etc/release
|
|
|
|
|
@@ -13,8 +12,8 @@ RUN yum install -y rsync \
|
|
|
&& yum install -y supervisor \
|
|
|
&& 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
|
|
|
-
|
|
|
+COPY supervisord.conf /etc/supervisord.conf
|
|
|
|
|
|
#start resin
|
|
|
ENTRYPOINT ["entrypoint.sh"]
|
|
|
-CMD ["/usr/bin/supervisord","-c", "/etc/supervisor/supervisord.conf"]
|
|
|
+CMD ["/usr/bin/supervisord"]
|