|
@@ -10,7 +10,7 @@ ENV RESIN_HOME /app/soft/resin-4.0.65
|
|
|
COPY ./entrypoint.sh /usr/bin/entrypoint.sh
|
|
|
ADD http://10.26.22.185:9000/book/api-rs/resin-4.0.65-relase.tar.gz /app/soft/resin-4.0.65-relase.tar.gz
|
|
|
ADD http://10.26.22.185:9000/psop/soft/flume-1.7.0.tar.gz /app/soft/flume-1.7.0.tar.gz
|
|
|
-ADD http://10.26.22.185:9000/psop/soft/tengine.tar.gz /app/soft/tengine.tar.gz
|
|
|
+ADD http://10.26.22.185:9000/psop/soft/tengine.2.3.0.tar.gz /app/soft/tengine.2.3.0.tar.gz
|
|
|
ADD http://10.26.22.185:9000/psop/soft/jdk-8u101-linux-x64.tar.gz /usr/java/jdk-8u101-linux-x64.tar.gz
|
|
|
ADD http://mirrors.163.com/.help/CentOS7-Base-163.repo /opt/Centos-7.repo
|
|
|
ADD http://mirrors.aliyun.com/repo/epel-7.repo /opt/epel-7.repo
|
|
@@ -18,17 +18,17 @@ ADD http://mirrors.aliyun.com/repo/epel-7.repo /opt/epel-7.repo
|
|
|
RUN rm -rf /etc/yum.repos.d/* \
|
|
|
&& mv /opt/*.repo /etc/yum.repos.d/ \
|
|
|
&& yum clean all \
|
|
|
- && yum install supervisor crontabs rsyslog -y \
|
|
|
+ && yum install supervisor crontabs rsyslog rsync telnet* lsof psmisc -y \
|
|
|
&& ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone \
|
|
|
&& tar -xf /app/soft/resin-4.0.65-relase.tar.gz -C /app/soft \
|
|
|
&& tar -xf /app/soft/flume-1.7.0.tar.gz -C /app/soft \
|
|
|
- && tar -xf /app/soft/tengine.tar.gz -C /app/soft \
|
|
|
+ && tar -xf /app/soft/tengine.2.3.0.tar.gz -C /app/soft \
|
|
|
&& mkdir -p /app/soft/tengine/conf/vhosts/www \
|
|
|
&& useradd wapage && useradd nginx \
|
|
|
&& tar -xf /usr/java/jdk-8u101-linux-x64.tar.gz -C /usr/java \
|
|
|
&& rm -f /app/soft/resin-4.0.65-relase.tar.gz \
|
|
|
&& rm -f /app/soft/flume-1.7.0.tar.gz \
|
|
|
- && rm -f /app/soft/tengine.tar.gz \
|
|
|
+ && rm -f /app/soft/tengine.2.3.0.tar.gz \
|
|
|
&& rm -f /usr/java/jdk-8u101-linux-x64.tar.gz \
|
|
|
&& rm -rf /app/soft/resin-4.0.65/webapps/* \
|
|
|
&& chown wapage.wapage -R /app/soft/resin-4.0.65/ \
|
|
@@ -42,9 +42,11 @@ COPY root /var/spool/cron/root
|
|
|
COPY rsyncd.wapage /etc/rsyncd.wapage
|
|
|
COPY release /etc/release
|
|
|
COPY flume.conf /app/soft/flume-1.7.0/conf/flume.conf
|
|
|
-COPY resin.ini /etc/supervisor/conf.d/resin.ini
|
|
|
+COPY resin.ini /etc/supervisord.d/resin.ini
|
|
|
|
|
|
+RUN export RELEASE=`head -n 1 /etc/release` \
|
|
|
+ && rsync -vzrtopg --progress $RELEASE/easou-web.war /app/soft/resin-4.0.65/webapps/ROOT.war --password-file=/etc/rsyncd.wapage
|
|
|
|
|
|
ENTRYPOINT ["entrypoint.sh"]
|
|
|
-CMD ["/usr/bin/supervisord","-c", "/etc/supervisor/supervisord.conf"]
|
|
|
+CMD ["/usr/bin/supervisord","-c", "/etc/supervisord.conf"]
|
|
|
|