增加MRZCPD在firewall容器中的集成。

dockerfile/firewall/Dockerfile

@@ -1,9 +1,22 @@
 FROM docker.io/centos:7
 
+COPY mrzcpd-debug-4.3.30.cee158a-1.el7.x86_64.rpm /run/
+COPY mrzcpd-debug-debuginfo-4.3.30.cee158a-1.el7.x86_64.rpm /run/
+
 COPY MESA-Framework.repo /etc/yum.repos.d/
 COPY framework.conf  aws.conf /etc/ld.so.conf.d/
-#COPY aws.conf /etc/ld.so.conf.d/
 COPY supervisord.conf /etc/
+COPY usvhost_create.sh /tmp/
+
+RUN sed -e 's|^mirrorlist=|#mirrorlist=|g' \
+        -e 's|^#baseurl=http://mirror.centos.org|baseurl=https://mirrors.tuna.tsinghua.edu.cn|g' \
+        -i.bak /etc/yum.repos.d/CentOS-*.repo
+
+RUN yum install libpcap numactl systemd-libs -y && \
+    yum localinstall -y /run/mrzcpd-debug-4.3.30.cee158a-1.el7.x86_64.rpm && \
+    yum localinstall -y /run/mrzcpd-debug-debuginfo-4.3.30.cee158a-1.el7.x86_64.rpm
+
+RUN mkdir -p /var/run/mrzcpd/
 
 RUN yum makecache \
   && yum install -y \
@@ -22,7 +35,6 @@ RUN yum makecache \
   libWiredLB \
   lz4 \
   libbreakpad_mini \
-  mrzcpd \
   sapp \
   tcpdump_mesa \
   tsg_master \

dockerfile/firewall/supervisord.conf

@@ -147,9 +147,23 @@ serverurl=unix:///tmp/supervisor.sock ; use a unix:// URL  for a unix socket
 ;[include]
 ;files = relative/directory/*.ini
 
+[program:usvhost0]
+command=/bin/bash -ex /tmp/usvhost_create.sh
+priority=300
+user=root
+redirect_stderr=true
+
+[program:mrzcpd]
+command=/opt/mrzcpd/bin/mrzcpd -c /opt/mrzcpd/etc/mrglobal.conf
+autostart=true
+priority=400
+user=root
+redirect_stderr=true
+
 [program:sapp]
 command=/home/mesasoft/sapp_run/sapp
 autostart=true
 directory=/home/mesasoft/sapp_run
-stdout_logfile=/tmp/sapp_stdout.log
-stderr_logfile=/tmp/sapp_stderr.log
+priority=401
+user=root
+redirect_stderr=true

dockerfile/firewall/usvhost_create.sh

@@ -0,0 +1,5 @@
+#!/bin/bash -ex
+mkdir -p /run/usvhost 
+python -c "import socket as s; sock = s.socket(s.AF_UNIX); sock.bind('/run/usvhost/usvhost0')"
+python -c "import socket as s; sock = s.socket(s.AF_UNIX); sock.bind('/run/usvhost/usvhost1')"
+exec tail -f /dev/null