root 4 anos atrás
pai
commit
efcbb61c8b
5 arquivos alterados com 17 adições e 17 exclusões
  1. 8 6
      Dockerfile-v3base
  2. 4 5
      entrypoint.sh
  3. 1 2
      nginxlog_cut.sh
  4. 2 2
      resin.ini
  5. 2 2
      www.conf

+ 8 - 6
Dockerfile-v3base

@@ -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"]
 

+ 4 - 5
entrypoint.sh

@@ -3,12 +3,11 @@
 set -e
 set -o pipefail
 chmod 600 /var/spool/cron/root
-chkconfig  --level 35 crond on
-/bin/systemctl start crond
-/bin/systemctl restart rsyslog
-mkdir -p /log/nginx/visit
+#/bin/systemctl start crond
+#/bin/systemctl restart rsyslog
+mkdir -p /log/nginx/visit /data/wapage/log/indexpage/
 mkdir -p /data/log/devlog  /data/log/other  /data/log/qd  /data/project
-mv /app/soft/resin-pro-3.1.6/webapps/ROOT.war /data/project/ROOT.war
+mv /app/soft/resin-4.0.65/webapps/ROOT.war /data/project/ROOT.war
 chown wapage:wapage -R /data
 chown nginx:nginx -R /log
 

+ 1 - 2
nginxlog_cut.sh

@@ -2,8 +2,7 @@
 log_path=/log/nginx/visit
 DATE=$(date +%Y%m%d%H --date='1 hour ago')
 mv $log_path/access.log $log_path/access.log.$DATE
-mv $qd_log_path/access.log $qd_log_path/access.log.$DATE
 kill -USR1 `cat /app/soft/tengine/nginx.pid`
 
 find /log/ -daystart -type f -mtime +1 -exec rm -f '{}' ';'
-find /data/wapage/log/indexpage/ -daystart -type f -mtime +3 -exec rm -f '{}' ';'
+find /data/wapage/log/indexpage/ -daystart -type f -mtime +3 -exec rm -f '{}' ';'

+ 2 - 2
resin.ini

@@ -1,5 +1,5 @@
 [program:resin]
-command=/app/soft/resin-4.0.65/bin/resin.sh
+command=/app/soft/resin-4.0.65/bin/resin.sh console
 process_name=%(program_name)s
 environment=JAVA_HOME=" /usr/java/jdk1.8.0_101/",JAVA_BIN="/usr/java/jdk1.8.0_101/bin"
 priority=1000
@@ -41,4 +41,4 @@ stdout_logfile=/app/soft/flume-1.7.0/log/dir.log
 stdout_logfile_maxbytes=200MB
 stdout_logfile_backups=10 
 stderr_logfile=/app/soft/flume-1.7.0/log/dir_err.log
-stderr_logfile_maxbytes=100MB
+stderr_logfile_maxbytes=100MB

+ 2 - 2
www.conf

@@ -4,7 +4,7 @@ listen              80;
 server_name    0.0.0.0;
 ####################################
 location /status {
-check_status;
+#check_status;
 access_log   off;
 }
 ####################################
@@ -52,4 +52,4 @@ log_format www.easou.com  'v2{]easou.com{]$request{]$upstream_http_esid{]$year$m
 
 
 access_log /log/nginx/visit/access.log www.easou.com;
-include vhosts/www/hostlist.conf;
+include vhosts/www/hostlist.conf;