Merge pull request #145 from nttcom/update-zkg-install-packages

install zeek parser by zkg command

osect_sensor/Infrastructure/edge_cron/Dockerfile

@@ -154,7 +154,8 @@ ENV PATH $PATH:/root/.cargo/bin
 # zkgパッケージ（必要なものだけ入れる）
 ENV PATH $PATH:/usr/local/zeek/bin
 # RUN zkg autoconfig
-RUN zkg install --force --skiptest \
+RUN zkg refresh && \
+    zkg install --force --skiptest \
 #    zeek-plugin-bacnet \
 #    zeek-plugin-enip \
 #    zeek-plugin-profinet \
@@ -164,45 +165,14 @@ RUN zkg install --force --skiptest \
     icsnpp-modbus \
     # icsnpp-bacnet \
     zeek/corelight/zeek-long-connections \
-    zeek-af_packet-plugin
-
-# spicyのコンパイル
-WORKDIR /home/work/ot_tools/broscript/CIFS_B/
-RUN spicyz -o CIFS_B.hlto CIFS_B.spicy CIFS_B.evt
-
-WORKDIR /home/work/ot_tools/broscript/MYDHCP/
-RUN spicyz -o MYDHCP.hlto MYDHCP.spicy zeek_MYDHCP.spicy MYDHCP.evt
-
-WORKDIR /home/work/ot_tools/broscript/DHCPV6/
-RUN spicyz -o dhcpv6.hlto dhcpv6.spicy zeek_dhcpv6.spicy dhcpv6.evt
-
-WORKDIR /home/work/ot_tools/broscript/NBNS/
-RUN spicyz -o nbns.hlto nbns.spicy nbns.evt
-
-WORKDIR /home/work/ot_tools/broscript/SSDP/
-RUN spicyz -o ssdp.hlto ssdp.spicy ssdp.evt
-
-WORKDIR /home/work/ot_tools/broscript/CC_LINK_BASIC/
-RUN spicyz -o cc_link_basic.hlto cc_link_basic.spicy cc_link_basic.evt
-
-WORKDIR /home/work/ot_tools/broscript/CC_LINK_NOIP/
-RUN spicyz -o cc_link_noip.hlto cc_link_noip.spicy cc_link_noip.evt
-
-WORKDIR /home/work
-RUN cp -p ot_tools/broscript/CIFS_B/CIFS_B.hlto /usr/local/zeek/lib/zeek-spicy/modules \
-    && cp -p ot_tools/broscript/CIFS_B/CIFS_B.zeek /usr/local/zeek/share/zeek/site \
-    && cp -p ot_tools/broscript/MYDHCP/MYDHCP.hlto /usr/local/zeek/lib/zeek-spicy/modules \
-    && cp -p ot_tools/broscript/MYDHCP/MYDHCP.zeek /usr/local/zeek/share/zeek/site \
-    && cp -p ot_tools/broscript/DHCPV6/dhcpv6.hlto /usr/local/zeek/lib/zeek-spicy/modules \
-    && cp -p ot_tools/broscript/DHCPV6/dhcpv6.zeek /usr/local/zeek/share/zeek/site \
-    && cp -p ot_tools/broscript/NBNS/nbns.hlto /usr/local/zeek/lib/zeek-spicy/modules \
-    && cp -p ot_tools/broscript/NBNS/nbns.zeek /usr/local/zeek/share/zeek/site \
-    && cp -p ot_tools/broscript/SSDP/ssdp.hlto /usr/local/zeek/lib/zeek-spicy/modules \
-    && cp -p ot_tools/broscript/SSDP/ssdp.zeek /usr/local/zeek/share/zeek/site \
-    && cp -p ot_tools/broscript/CC_LINK_BASIC/cc_link_basic.hlto /usr/local/zeek/lib/zeek-spicy/modules \
-    && cp -p ot_tools/broscript/CC_LINK_BASIC/cc_link_basic.zeek /usr/local/zeek/share/zeek/site \
-    && cp -p ot_tools/broscript/CC_LINK_NOIP/cc_link_noip.hlto /usr/local/zeek/lib/zeek-spicy/modules \
-    && cp -p ot_tools/broscript/CC_LINK_NOIP/cc_link_noip.zeek /usr/local/zeek/share/zeek/site
+    zeek-af_packet-plugin \
+    zeek-parser-CCLinkFieldBasic \
+    zeek-parser-CCLinkField-CCLinkControl \
+    zeek-parser-CIFS-COM \
+    zeek-parser-CIFS-NBNS-COM \
+    zeek-parser-DHCPv4-COM \
+    zeek-parser-DHCPv6-COM \
+    zeek-parser-SSDP-COM
 
 # Yafを含むバイナリファイルをコピー
 RUN mkdir /var/log/yaf
@@ -234,8 +204,6 @@ RUN mkdir /opt/ot_tools \
     && cp -p ot_tools/broscript/http/mac-logging.zeek /usr/local/zeek/share/zeek/base/protocols/http/ \
     && cp -p ot_tools/broscript/arp.zeek /usr/local/zeek/share/zeek/site \
     && cp -p ot_tools/broscript/ns.zeek /usr/local/zeek/share/zeek/site \
-    && cp -p ot_tools/broscript/main_bacnet.zeek /usr/local/zeek/share/zeek/site \
-    && cp -p ot_tools/broscript/consts_bacnet.zeek /usr/local/zeek/share/zeek/site \
     && cp -p ot_tools/broscript/zeek_long_connections/main.zeek /usr/local/zeek/share/zeek/site/zeek-long-connections/ \
     && cp -p ot_tools/broscript/dns.zeek /usr/local/zeek/share/zeek/base/protocols/dns/main.zeek \
     # && cp -p zeek-parser-Bacnet/scripts/bacnet_ip.zeek /usr/local/zeek/share/zeek/site/icsnpp-bacnet/main.zeek \