Remove unneeded Dockerfile from Zeek (elastic#597)

The sample logs can be copied between volumes rather than added to a layer in the image via a Dockerfile.
build-security · Feb 1, 2021 · a01adb7 · a01adb7
1 parent 8dacb9c
commit a01adb7
Show file tree

Hide file tree

Showing 36 changed files with 4 additions and 9 deletions.
diff --git a/packages/zeek/_dev/deploy/docker/Dockerfile b/packages/zeek/_dev/deploy/docker/Dockerfile
diff --git a/packages/zeek/_dev/deploy/docker/docker-compose.yml b/packages/zeek/_dev/deploy/docker/docker-compose.yml
@@ -1,8 +1,8 @@
 version: '2.3'
 services:
   zeek:
-    tty: true
-    build: .
+    image: alpine
     volumes:
-      - ${SERVICE_LOGS_DIR}:/logs
-    command: -c "cp /sample_logs/*.log /logs/"
+      - ./sample_logs:/sample_logs:ro
+      - ${SERVICE_LOGS_DIR}:/var/log
+    command: /bin/sh -c "cp /sample_logs/* /var/log/"
diff --git a/.../zeek/_dev/deploy/docker/capture_loss.log → ...eploy/docker/sample_logs/capture_loss.log b/.../zeek/_dev/deploy/docker/capture_loss.log → ...eploy/docker/sample_logs/capture_loss.log
diff --git a/packages/zeek/_dev/deploy/docker/conn.log → ...k/_dev/deploy/docker/sample_logs/conn.log b/packages/zeek/_dev/deploy/docker/conn.log → ...k/_dev/deploy/docker/sample_logs/conn.log
diff --git a/packages/zeek/_dev/deploy/docker/dce_rpc.log → ...dev/deploy/docker/sample_logs/dce_rpc.log b/packages/zeek/_dev/deploy/docker/dce_rpc.log → ...dev/deploy/docker/sample_logs/dce_rpc.log
diff --git a/packages/zeek/_dev/deploy/docker/dhcp.log → ...k/_dev/deploy/docker/sample_logs/dhcp.log b/packages/zeek/_dev/deploy/docker/dhcp.log → ...k/_dev/deploy/docker/sample_logs/dhcp.log
diff --git a/packages/zeek/_dev/deploy/docker/dnp3.log → ...k/_dev/deploy/docker/sample_logs/dnp3.log b/packages/zeek/_dev/deploy/docker/dnp3.log → ...k/_dev/deploy/docker/sample_logs/dnp3.log
diff --git a/packages/zeek/_dev/deploy/docker/dns.log → ...ek/_dev/deploy/docker/sample_logs/dns.log b/packages/zeek/_dev/deploy/docker/dns.log → ...ek/_dev/deploy/docker/sample_logs/dns.log
diff --git a/packages/zeek/_dev/deploy/docker/dpd.log → ...ek/_dev/deploy/docker/sample_logs/dpd.log b/packages/zeek/_dev/deploy/docker/dpd.log → ...ek/_dev/deploy/docker/sample_logs/dpd.log
diff --git a/packages/zeek/_dev/deploy/docker/files.log → .../_dev/deploy/docker/sample_logs/files.log b/packages/zeek/_dev/deploy/docker/files.log → .../_dev/deploy/docker/sample_logs/files.log
diff --git a/packages/zeek/_dev/deploy/docker/http.log → ...k/_dev/deploy/docker/sample_logs/http.log b/packages/zeek/_dev/deploy/docker/http.log → ...k/_dev/deploy/docker/sample_logs/http.log
diff --git a/packages/zeek/_dev/deploy/docker/intel.log → .../_dev/deploy/docker/sample_logs/intel.log b/packages/zeek/_dev/deploy/docker/intel.log → .../_dev/deploy/docker/sample_logs/intel.log
diff --git a/packages/zeek/_dev/deploy/docker/irc.log → ...ek/_dev/deploy/docker/sample_logs/irc.log b/packages/zeek/_dev/deploy/docker/irc.log → ...ek/_dev/deploy/docker/sample_logs/irc.log
diff --git a/...ages/zeek/_dev/deploy/docker/kerberos.log → ...ev/deploy/docker/sample_logs/kerberos.log b/...ages/zeek/_dev/deploy/docker/kerberos.log → ...ev/deploy/docker/sample_logs/kerberos.log
diff --git a/packages/zeek/_dev/deploy/docker/modbus.log → ..._dev/deploy/docker/sample_logs/modbus.log b/packages/zeek/_dev/deploy/docker/modbus.log → ..._dev/deploy/docker/sample_logs/modbus.log
diff --git a/packages/zeek/_dev/deploy/docker/mysql.log → .../_dev/deploy/docker/sample_logs/mysql.log b/packages/zeek/_dev/deploy/docker/mysql.log → .../_dev/deploy/docker/sample_logs/mysql.log
diff --git a/packages/zeek/_dev/deploy/docker/notice.log → ..._dev/deploy/docker/sample_logs/notice.log b/packages/zeek/_dev/deploy/docker/notice.log → ..._dev/deploy/docker/sample_logs/notice.log
diff --git a/packages/zeek/_dev/deploy/docker/ntlm.log → ...k/_dev/deploy/docker/sample_logs/ntlm.log b/packages/zeek/_dev/deploy/docker/ntlm.log → ...k/_dev/deploy/docker/sample_logs/ntlm.log
diff --git a/packages/zeek/_dev/deploy/docker/pe.log → ...eek/_dev/deploy/docker/sample_logs/pe.log b/packages/zeek/_dev/deploy/docker/pe.log → ...eek/_dev/deploy/docker/sample_logs/pe.log
diff --git a/packages/zeek/_dev/deploy/docker/radius.log → ..._dev/deploy/docker/sample_logs/radius.log b/packages/zeek/_dev/deploy/docker/radius.log → ..._dev/deploy/docker/sample_logs/radius.log
diff --git a/packages/zeek/_dev/deploy/docker/rdp.log → ...ek/_dev/deploy/docker/sample_logs/rdp.log b/packages/zeek/_dev/deploy/docker/rdp.log → ...ek/_dev/deploy/docker/sample_logs/rdp.log
diff --git a/packages/zeek/_dev/deploy/docker/rfb.log → ...ek/_dev/deploy/docker/sample_logs/rfb.log b/packages/zeek/_dev/deploy/docker/rfb.log → ...ek/_dev/deploy/docker/sample_logs/rfb.log
diff --git a/packages/zeek/_dev/deploy/docker/sip.log → ...ek/_dev/deploy/docker/sample_logs/sip.log b/packages/zeek/_dev/deploy/docker/sip.log → ...ek/_dev/deploy/docker/sample_logs/sip.log
diff --git a/packages/zeek/_dev/deploy/docker/smb_cmd.log → ...dev/deploy/docker/sample_logs/smb_cmd.log b/packages/zeek/_dev/deploy/docker/smb_cmd.log → ...dev/deploy/docker/sample_logs/smb_cmd.log
diff --git a/...ges/zeek/_dev/deploy/docker/smb_files.log → ...v/deploy/docker/sample_logs/smb_files.log b/...ges/zeek/_dev/deploy/docker/smb_files.log → ...v/deploy/docker/sample_logs/smb_files.log
diff --git a/...s/zeek/_dev/deploy/docker/smb_mapping.log → ...deploy/docker/sample_logs/smb_mapping.log b/...s/zeek/_dev/deploy/docker/smb_mapping.log → ...deploy/docker/sample_logs/smb_mapping.log
diff --git a/packages/zeek/_dev/deploy/docker/smtp.log → ...k/_dev/deploy/docker/sample_logs/smtp.log b/packages/zeek/_dev/deploy/docker/smtp.log → ...k/_dev/deploy/docker/sample_logs/smtp.log
diff --git a/packages/zeek/_dev/deploy/docker/snmp.log → ...k/_dev/deploy/docker/sample_logs/snmp.log b/packages/zeek/_dev/deploy/docker/snmp.log → ...k/_dev/deploy/docker/sample_logs/snmp.log
diff --git a/packages/zeek/_dev/deploy/docker/socks.log → .../_dev/deploy/docker/sample_logs/socks.log b/packages/zeek/_dev/deploy/docker/socks.log → .../_dev/deploy/docker/sample_logs/socks.log
diff --git a/packages/zeek/_dev/deploy/docker/ssh.log → ...ek/_dev/deploy/docker/sample_logs/ssh.log b/packages/zeek/_dev/deploy/docker/ssh.log → ...ek/_dev/deploy/docker/sample_logs/ssh.log
diff --git a/packages/zeek/_dev/deploy/docker/ssl.log → ...ek/_dev/deploy/docker/sample_logs/ssl.log b/packages/zeek/_dev/deploy/docker/ssl.log → ...ek/_dev/deploy/docker/sample_logs/ssl.log
diff --git a/packages/zeek/_dev/deploy/docker/stats.log → .../_dev/deploy/docker/sample_logs/stats.log b/packages/zeek/_dev/deploy/docker/stats.log → .../_dev/deploy/docker/sample_logs/stats.log
diff --git a/...es/zeek/_dev/deploy/docker/traceroute.log → .../deploy/docker/sample_logs/traceroute.log b/...es/zeek/_dev/deploy/docker/traceroute.log → .../deploy/docker/sample_logs/traceroute.log
diff --git a/packages/zeek/_dev/deploy/docker/tunnel.log → ..._dev/deploy/docker/sample_logs/tunnel.log b/packages/zeek/_dev/deploy/docker/tunnel.log → ..._dev/deploy/docker/sample_logs/tunnel.log
diff --git a/packages/zeek/_dev/deploy/docker/weird.log → .../_dev/deploy/docker/sample_logs/weird.log b/packages/zeek/_dev/deploy/docker/weird.log → .../_dev/deploy/docker/sample_logs/weird.log
diff --git a/packages/zeek/_dev/deploy/docker/x509.log → ...k/_dev/deploy/docker/sample_logs/x509.log b/packages/zeek/_dev/deploy/docker/x509.log → ...k/_dev/deploy/docker/sample_logs/x509.log