Skip to content

Commit 0bc5502

Browse files
mmguerommguero
committed
Merge remote-tracking branch 'cisa/master'
2 parents da7fcee + 7c18748 commit 0bc5502

File tree

11 files changed

+92
-92
lines changed

11 files changed

+92
-92
lines changed

‎Dockerfiles/zeek.Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@ ENV DEBIAN_FRONTEND noninteractive
66

77
# build zeek and plugins (spicy, additional protocol parsers, etc.)
88

9-
ENV BISON_VERSION "3.7.2"
9+
ENV BISON_VERSION "3.7.4"
1010
ENV CCACHE_DIR "/var/spool/ccache"
1111
ENV CCACHE_COMPRESS 1
1212
ENV CMAKE_DIR "/opt/cmake"
13-
ENV CMAKE_VERSION "3.18.4"
13+
ENV CMAKE_VERSION "3.19.1"
1414
ENV SPICY_DIR "/opt/spicy"
1515
ENV SRC_BASE_DIR "/usr/local/src"
1616
ENV ZEEK_DIR "/opt/zeek"
1717
ENV ZEEK_PATCH_DIR "${SRC_BASE_DIR}/zeek-patches"
1818
ENV ZEEK_SRC_DIR "${SRC_BASE_DIR}/zeek-${ZEEK_VERSION}"
19-
ENV ZEEK_VERSION "3.0.11"
19+
ENV ZEEK_VERSION "3.0.12"
2020

2121
# using clang now instead of gcc because Spicy depends on it
22-
ENV LLVM_VERSION "10"
22+
ENV LLVM_VERSION "11"
2323
ENV CC "clang-${LLVM_VERSION}"
2424
ENV CXX "clang++-${LLVM_VERSION}"
2525
ENV ASM "clang-${LLVM_VERSION}"
@@ -109,7 +109,7 @@ ENV PUSER_PRIV_DROP true
109109
ENV DEBIAN_FRONTEND noninteractive
110110
ENV TERM xterm
111111

112-
ENV LLVM_VERSION "10"
112+
ENV LLVM_VERSION "11"
113113
ENV ZEEK_DIR "/opt/zeek"
114114
ENV SPICY_DIR "/opt/spicy"
115115

‎README.md

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -157,22 +157,22 @@ You can then observe that the images have been retrieved by running `docker imag
157157
```
158158
$ docker images
159159
REPOSITORY TAG IMAGE ID CREATED SIZE
160-
malcolmnetsec/curator 2.4.2 xxxxxxxxxxxx 40 hours ago 256MB
161-
malcolmnetsec/elastalert 2.4.2 xxxxxxxxxxxx 40 hours ago 410MB
162-
malcolmnetsec/elasticsearch-oss 2.4.2 xxxxxxxxxxxx 40 hours ago 690MB
163-
malcolmnetsec/file-monitor 2.4.2 xxxxxxxxxxxx 39 hours ago 470MB
164-
malcolmnetsec/file-upload 2.4.2 xxxxxxxxxxxx 39 hours ago 199MB
165-
malcolmnetsec/filebeat-oss 2.4.2 xxxxxxxxxxxx 39 hours ago 555MB
166-
malcolmnetsec/freq 2.4.2 xxxxxxxxxxxx 39 hours ago 390MB
167-
malcolmnetsec/htadmin 2.4.2 xxxxxxxxxxxx 39 hours ago 180MB
168-
malcolmnetsec/kibana-oss 2.4.2 xxxxxxxxxxxx 40 hours ago 1.16GB
169-
malcolmnetsec/logstash-oss 2.4.2 xxxxxxxxxxxx 39 hours ago 1.41GB
170-
malcolmnetsec/arkime 2.4.2 xxxxxxxxxxxx 17 hours ago 683MB
171-
malcolmnetsec/name-map-ui 2.4.2 xxxxxxxxxxxx 39 hours ago 137MB
172-
malcolmnetsec/nginx-proxy 2.4.2 xxxxxxxxxxxx 39 hours ago 120MB
173-
malcolmnetsec/pcap-capture 2.4.2 xxxxxxxxxxxx 39 hours ago 111MB
174-
malcolmnetsec/pcap-monitor 2.4.2 xxxxxxxxxxxx 39 hours ago 157MB
175-
malcolmnetsec/zeek 2.4.2 xxxxxxxxxxxx 39 hours ago 887MB
160+
malcolmnetsec/curator 2.5.0 xxxxxxxxxxxx 40 hours ago 256MB
161+
malcolmnetsec/elastalert 2.5.0 xxxxxxxxxxxx 40 hours ago 410MB
162+
malcolmnetsec/elasticsearch-oss 2.5.0 xxxxxxxxxxxx 40 hours ago 690MB
163+
malcolmnetsec/file-monitor 2.5.0 xxxxxxxxxxxx 39 hours ago 470MB
164+
malcolmnetsec/file-upload 2.5.0 xxxxxxxxxxxx 39 hours ago 199MB
165+
malcolmnetsec/filebeat-oss 2.5.0 xxxxxxxxxxxx 39 hours ago 555MB
166+
malcolmnetsec/freq 2.5.0 xxxxxxxxxxxx 39 hours ago 390MB
167+
malcolmnetsec/htadmin 2.5.0 xxxxxxxxxxxx 39 hours ago 180MB
168+
malcolmnetsec/kibana-oss 2.5.0 xxxxxxxxxxxx 40 hours ago 1.16GB
169+
malcolmnetsec/logstash-oss 2.5.0 xxxxxxxxxxxx 39 hours ago 1.41GB
170+
malcolmnetsec/arkime 2.5.0 xxxxxxxxxxxx 17 hours ago 683MB
171+
malcolmnetsec/name-map-ui 2.5.0 xxxxxxxxxxxx 39 hours ago 137MB
172+
malcolmnetsec/nginx-proxy 2.5.0 xxxxxxxxxxxx 39 hours ago 120MB
173+
malcolmnetsec/pcap-capture 2.5.0 xxxxxxxxxxxx 39 hours ago 111MB
174+
malcolmnetsec/pcap-monitor 2.5.0 xxxxxxxxxxxx 39 hours ago 157MB
175+
malcolmnetsec/zeek 2.5.0 xxxxxxxxxxxx 39 hours ago 887MB
176176
```
177177

178178
#### Import from pre-packaged tarballs
@@ -1431,7 +1431,7 @@ Building the ISO may take 30 minutes or more depending on your system. As the bu
14311431

14321432
```
14331433
…
1434-
Finished, created "/malcolm-build/malcolm-iso/malcolm-2.4.2.iso"
1434+
Finished, created "/malcolm-build/malcolm-iso/malcolm-2.5.0.iso"
14351435
…
14361436
```
14371437

@@ -1832,22 +1832,22 @@ Pulling zeek ... done
18321832
18331833
user@host:~/Malcolm$ docker images
18341834
REPOSITORY TAG IMAGE ID CREATED SIZE
1835-
malcolmnetsec/curator 2.4.2 xxxxxxxxxxxx 40 hours ago 256MB
1836-
malcolmnetsec/elastalert 2.4.2 xxxxxxxxxxxx 40 hours ago 410MB
1837-
malcolmnetsec/elasticsearch-oss 2.4.2 xxxxxxxxxxxx 40 hours ago 690MB
1838-
malcolmnetsec/file-monitor 2.4.2 xxxxxxxxxxxx 39 hours ago 470MB
1839-
malcolmnetsec/file-upload 2.4.2 xxxxxxxxxxxx 39 hours ago 199MB
1840-
malcolmnetsec/filebeat-oss 2.4.2 xxxxxxxxxxxx 39 hours ago 555MB
1841-
malcolmnetsec/freq 2.4.2 xxxxxxxxxxxx 39 hours ago 390MB
1842-
malcolmnetsec/htadmin 2.4.2 xxxxxxxxxxxx 39 hours ago 180MB
1843-
malcolmnetsec/kibana-oss 2.4.2 xxxxxxxxxxxx 40 hours ago 1.16GB
1844-
malcolmnetsec/logstash-oss 2.4.2 xxxxxxxxxxxx 39 hours ago 1.41GB
1845-
malcolmnetsec/arkime 2.4.2 xxxxxxxxxxxx 17 hours ago 683MB
1846-
malcolmnetsec/name-map-ui 2.4.2 xxxxxxxxxxxx 39 hours ago 137MB
1847-
malcolmnetsec/nginx-proxy 2.4.2 xxxxxxxxxxxx 39 hours ago 120MB
1848-
malcolmnetsec/pcap-capture 2.4.2 xxxxxxxxxxxx 39 hours ago 111MB
1849-
malcolmnetsec/pcap-monitor 2.4.2 xxxxxxxxxxxx 39 hours ago 157MB
1850-
malcolmnetsec/zeek 2.4.2 xxxxxxxxxxxx 39 hours ago 887MB
1835+
malcolmnetsec/curator 2.5.0 xxxxxxxxxxxx 40 hours ago 256MB
1836+
malcolmnetsec/elastalert 2.5.0 xxxxxxxxxxxx 40 hours ago 410MB
1837+
malcolmnetsec/elasticsearch-oss 2.5.0 xxxxxxxxxxxx 40 hours ago 690MB
1838+
malcolmnetsec/file-monitor 2.5.0 xxxxxxxxxxxx 39 hours ago 470MB
1839+
malcolmnetsec/file-upload 2.5.0 xxxxxxxxxxxx 39 hours ago 199MB
1840+
malcolmnetsec/filebeat-oss 2.5.0 xxxxxxxxxxxx 39 hours ago 555MB
1841+
malcolmnetsec/freq 2.5.0 xxxxxxxxxxxx 39 hours ago 390MB
1842+
malcolmnetsec/htadmin 2.5.0 xxxxxxxxxxxx 39 hours ago 180MB
1843+
malcolmnetsec/kibana-oss 2.5.0 xxxxxxxxxxxx 40 hours ago 1.16GB
1844+
malcolmnetsec/logstash-oss 2.5.0 xxxxxxxxxxxx 39 hours ago 1.41GB
1845+
malcolmnetsec/arkime 2.5.0 xxxxxxxxxxxx 17 hours ago 683MB
1846+
malcolmnetsec/name-map-ui 2.5.0 xxxxxxxxxxxx 39 hours ago 137MB
1847+
malcolmnetsec/nginx-proxy 2.5.0 xxxxxxxxxxxx 39 hours ago 120MB
1848+
malcolmnetsec/pcap-capture 2.5.0 xxxxxxxxxxxx 39 hours ago 111MB
1849+
malcolmnetsec/pcap-monitor 2.5.0 xxxxxxxxxxxx 39 hours ago 157MB
1850+
malcolmnetsec/zeek 2.5.0 xxxxxxxxxxxx 39 hours ago 887MB
18511851
```
18521852

18531853
Finally, we can start Malcolm. When Malcolm starts it will stream informational and debug messages to the console. If you wish, you can safely close the console or use `Ctrl+C` to stop these messages; Malcolm will continue running in the background.

‎docker-compose-standalone.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ x-pcap-capture-variables: &pcap-capture-variables
126126

127127
services:
128128
elasticsearch:
129-
image: malcolmnetsec/elasticsearch-oss:2.4.2
129+
image: malcolmnetsec/elasticsearch-oss:2.5.0
130130
restart: "no"
131131
stdin_open: false
132132
tty: true
@@ -161,7 +161,7 @@ services:
161161
retries: 3
162162
start_period: 180s
163163
kibana:
164-
image: malcolmnetsec/kibana-oss:2.4.2
164+
image: malcolmnetsec/kibana-oss:2.5.0
165165
restart: "no"
166166
stdin_open: false
167167
tty: true
@@ -187,7 +187,7 @@ services:
187187
retries: 3
188188
start_period: 210s
189189
elastalert:
190-
image: malcolmnetsec/elastalert:2.4.2
190+
image: malcolmnetsec/elastalert:2.5.0
191191
restart: "no"
192192
stdin_open: false
193193
tty: true
@@ -215,7 +215,7 @@ services:
215215
retries: 3
216216
start_period: 210s
217217
curator:
218-
image: malcolmnetsec/curator:2.4.2
218+
image: malcolmnetsec/curator:2.5.0
219219
restart: "no"
220220
stdin_open: false
221221
tty: true
@@ -234,7 +234,7 @@ services:
234234
retries: 3
235235
start_period: 30s
236236
logstash:
237-
image: malcolmnetsec/logstash-oss:2.4.2
237+
image: malcolmnetsec/logstash-oss:2.5.0
238238
restart: "no"
239239
stdin_open: false
240240
tty: true
@@ -267,7 +267,7 @@ services:
267267
retries: 3
268268
start_period: 600s
269269
filebeat:
270-
image: malcolmnetsec/filebeat-oss:2.4.2
270+
image: malcolmnetsec/filebeat-oss:2.5.0
271271
restart: "no"
272272
stdin_open: false
273273
tty: true
@@ -304,7 +304,7 @@ services:
304304
retries: 3
305305
start_period: 60s
306306
arkime:
307-
image: malcolmnetsec/arkime:2.4.2
307+
image: malcolmnetsec/arkime:2.5.0
308308
restart: "no"
309309
stdin_open: false
310310
tty: true
@@ -343,7 +343,7 @@ services:
343343
retries: 3
344344
start_period: 210s
345345
zeek:
346-
image: malcolmnetsec/zeek:2.4.2
346+
image: malcolmnetsec/zeek:2.5.0
347347
restart: "no"
348348
stdin_open: false
349349
tty: true
@@ -369,7 +369,7 @@ services:
369369
retries: 3
370370
start_period: 60s
371371
file-monitor:
372-
image: malcolmnetsec/file-monitor:2.4.2
372+
image: malcolmnetsec/file-monitor:2.5.0
373373
restart: "no"
374374
stdin_open: false
375375
tty: true
@@ -390,7 +390,7 @@ services:
390390
retries: 3
391391
start_period: 60s
392392
pcap-capture:
393-
image: malcolmnetsec/pcap-capture:2.4.2
393+
image: malcolmnetsec/pcap-capture:2.5.0
394394
restart: "no"
395395
stdin_open: false
396396
tty: true
@@ -416,7 +416,7 @@ services:
416416
retries: 3
417417
start_period: 60s
418418
pcap-monitor:
419-
image: malcolmnetsec/pcap-monitor:2.4.2
419+
image: malcolmnetsec/pcap-monitor:2.5.0
420420
restart: "no"
421421
stdin_open: false
422422
tty: true
@@ -439,7 +439,7 @@ services:
439439
retries: 3
440440
start_period: 90s
441441
upload:
442-
image: malcolmnetsec/file-upload:2.4.2
442+
image: malcolmnetsec/file-upload:2.5.0
443443
restart: "no"
444444
stdin_open: false
445445
tty: true
@@ -465,7 +465,7 @@ services:
465465
retries: 3
466466
start_period: 60s
467467
htadmin:
468-
image: malcolmnetsec/htadmin:2.4.2
468+
image: malcolmnetsec/htadmin:2.5.0
469469
restart: "no"
470470
stdin_open: false
471471
tty: true
@@ -487,7 +487,7 @@ services:
487487
retries: 3
488488
start_period: 60s
489489
freq:
490-
image: malcolmnetsec/freq:2.4.2
490+
image: malcolmnetsec/freq:2.5.0
491491
restart: "no"
492492
stdin_open: false
493493
tty: true
@@ -505,7 +505,7 @@ services:
505505
retries: 3
506506
start_period: 60s
507507
name-map-ui:
508-
image: malcolmnetsec/name-map-ui:2.4.2
508+
image: malcolmnetsec/name-map-ui:2.5.0
509509
restart: "no"
510510
stdin_open: false
511511
tty: true
@@ -526,7 +526,7 @@ services:
526526
retries: 3
527527
start_period: 60s
528528
nginx-proxy:
529-
image: malcolmnetsec/nginx-proxy:2.4.2
529+
image: malcolmnetsec/nginx-proxy:2.5.0
530530
restart: "no"
531531
stdin_open: false
532532
tty: true

0 commit comments

Comments
 (0)