Skip to content

Commit

Permalink
Merge pull request #276 from cisagov/v23.08.1_merge_cisagov
Browse files Browse the repository at this point in the history
Malcolm v23.08.1
  • Loading branch information
mmguero authored Aug 16, 2023
2 parents d5ee03e + 7db65be commit 0e83dd1
Show file tree
Hide file tree
Showing 35 changed files with 196 additions and 196 deletions.
2 changes: 1 addition & 1 deletion .trigger_iso_workflow_build
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# this file exists solely for the purpose of being updated and seen by github to trigger a commit build action
1
0
2 changes: 1 addition & 1 deletion .trigger_workflow_build
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# this file exists solely for the purpose of being updated and seen by github to trigger a commit build action
6
0
44 changes: 22 additions & 22 deletions docker-compose-standalone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version: '3.7'

services:
opensearch:
image: ghcr.io/idaholab/malcolm/opensearch:23.08.0
image: ghcr.io/idaholab/malcolm/opensearch:23.08.1
restart: "no"
stdin_open: false
tty: true
Expand Down Expand Up @@ -37,7 +37,7 @@ services:
retries: 3
start_period: 180s
dashboards-helper:
image: ghcr.io/idaholab/malcolm/dashboards-helper:23.08.0
image: ghcr.io/idaholab/malcolm/dashboards-helper:23.08.1
restart: "no"
stdin_open: false
tty: true
Expand All @@ -64,7 +64,7 @@ services:
retries: 3
start_period: 30s
dashboards:
image: ghcr.io/idaholab/malcolm/dashboards:23.08.0
image: ghcr.io/idaholab/malcolm/dashboards:23.08.1
restart: "no"
stdin_open: false
tty: true
Expand All @@ -90,7 +90,7 @@ services:
retries: 3
start_period: 210s
logstash:
image: ghcr.io/idaholab/malcolm/logstash-oss:23.08.0
image: ghcr.io/idaholab/malcolm/logstash-oss:23.08.1
restart: "no"
stdin_open: false
tty: true
Expand Down Expand Up @@ -132,7 +132,7 @@ services:
retries: 3
start_period: 600s
filebeat:
image: ghcr.io/idaholab/malcolm/filebeat-oss:23.08.0
image: ghcr.io/idaholab/malcolm/filebeat-oss:23.08.1
restart: "no"
stdin_open: false
tty: true
Expand Down Expand Up @@ -167,7 +167,7 @@ services:
retries: 3
start_period: 60s
arkime:
image: ghcr.io/idaholab/malcolm/arkime:23.08.0
image: ghcr.io/idaholab/malcolm/arkime:23.08.1
restart: "no"
stdin_open: false
tty: true
Expand Down Expand Up @@ -203,7 +203,7 @@ services:
retries: 3
start_period: 210s
zeek:
image: ghcr.io/idaholab/malcolm/zeek:23.08.0
image: ghcr.io/idaholab/malcolm/zeek:23.08.1
restart: "no"
stdin_open: false
tty: true
Expand Down Expand Up @@ -241,7 +241,7 @@ services:
retries: 3
start_period: 60s
zeek-live:
image: ghcr.io/idaholab/malcolm/zeek:23.08.0
image: ghcr.io/idaholab/malcolm/zeek:23.08.1
restart: "no"
stdin_open: false
tty: true
Expand Down Expand Up @@ -269,7 +269,7 @@ services:
- ./zeek-logs/extract_files:/zeek/extract_files
- ./zeek/intel:/opt/zeek/share/zeek/site/intel
suricata:
image: ghcr.io/idaholab/malcolm/suricata:23.08.0
image: ghcr.io/idaholab/malcolm/suricata:23.08.1
restart: "no"
stdin_open: false
tty: true
Expand Down Expand Up @@ -305,7 +305,7 @@ services:
retries: 3
start_period: 120s
suricata-live:
image: ghcr.io/idaholab/malcolm/suricata:23.08.0
image: ghcr.io/idaholab/malcolm/suricata:23.08.1
restart: "no"
stdin_open: false
tty: true
Expand All @@ -331,7 +331,7 @@ services:
- ./suricata-logs:/var/log/suricata
- ./suricata/rules:/opt/suricata/rules:ro
file-monitor:
image: ghcr.io/idaholab/malcolm/file-monitor:23.08.0
image: ghcr.io/idaholab/malcolm/file-monitor:23.08.1
restart: "no"
stdin_open: false
tty: true
Expand All @@ -357,7 +357,7 @@ services:
retries: 3
start_period: 60s
pcap-capture:
image: ghcr.io/idaholab/malcolm/pcap-capture:23.08.0
image: ghcr.io/idaholab/malcolm/pcap-capture:23.08.1
restart: "no"
stdin_open: false
tty: true
Expand All @@ -379,7 +379,7 @@ services:
- ./nginx/ca-trust:/var/local/ca-trust:ro
- ./pcap/upload:/pcap
pcap-monitor:
image: ghcr.io/idaholab/malcolm/pcap-monitor:23.08.0
image: ghcr.io/idaholab/malcolm/pcap-monitor:23.08.1
restart: "no"
stdin_open: false
tty: true
Expand All @@ -405,7 +405,7 @@ services:
retries: 3
start_period: 90s
upload:
image: ghcr.io/idaholab/malcolm/file-upload:23.08.0
image: ghcr.io/idaholab/malcolm/file-upload:23.08.1
restart: "no"
stdin_open: false
tty: true
Expand All @@ -432,7 +432,7 @@ services:
retries: 3
start_period: 60s
htadmin:
image: ghcr.io/idaholab/malcolm/htadmin:23.08.0
image: ghcr.io/idaholab/malcolm/htadmin:23.08.1
restart: "no"
stdin_open: false
tty: true
Expand All @@ -457,7 +457,7 @@ services:
retries: 3
start_period: 60s
freq:
image: ghcr.io/idaholab/malcolm/freq:23.08.0
image: ghcr.io/idaholab/malcolm/freq:23.08.1
restart: "no"
stdin_open: false
tty: true
Expand All @@ -479,7 +479,7 @@ services:
retries: 3
start_period: 60s
netbox:
image: ghcr.io/idaholab/malcolm/netbox:23.08.0
image: ghcr.io/idaholab/malcolm/netbox:23.08.1
restart: "no"
stdin_open: false
tty: true
Expand Down Expand Up @@ -511,7 +511,7 @@ services:
retries: 3
start_period: 120s
netbox-postgres:
image: ghcr.io/idaholab/malcolm/postgresql:23.08.0
image: ghcr.io/idaholab/malcolm/postgresql:23.08.1
restart: "no"
stdin_open: false
tty: true
Expand All @@ -535,7 +535,7 @@ services:
retries: 3
start_period: 45s
netbox-redis:
image: ghcr.io/idaholab/malcolm/redis:23.08.0
image: ghcr.io/idaholab/malcolm/redis:23.08.1
restart: "no"
stdin_open: false
tty: true
Expand Down Expand Up @@ -563,7 +563,7 @@ services:
retries: 3
start_period: 45s
netbox-redis-cache:
image: ghcr.io/idaholab/malcolm/redis:23.08.0
image: ghcr.io/idaholab/malcolm/redis:23.08.1
restart: "no"
stdin_open: false
tty: true
Expand All @@ -590,7 +590,7 @@ services:
retries: 3
start_period: 45s
api:
image: ghcr.io/idaholab/malcolm/api:23.08.0
image: ghcr.io/idaholab/malcolm/api:23.08.1
command: gunicorn --bind 0:5000 manage:app
restart: "no"
stdin_open: false
Expand All @@ -614,7 +614,7 @@ services:
retries: 3
start_period: 60s
nginx-proxy:
image: ghcr.io/idaholab/malcolm/nginx-proxy:23.08.0
image: ghcr.io/idaholab/malcolm/nginx-proxy:23.08.1
restart: "no"
stdin_open: false
tty: true
Expand Down
Loading

0 comments on commit 0e83dd1

Please sign in to comment.