Skip to content

Commit

Permalink
bump for v23.11.0 development
Browse files Browse the repository at this point in the history
  • Loading branch information
@mmguero
mmguero committed Oct 26, 2023
1 parent d371e60 commit fa17a78
Show file tree
Hide file tree
Showing 32 changed files with 171 additions and 171 deletions.
44 changes: 22 additions & 22 deletions docker-compose-standalone.yml
View file
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.10.0
image: ghcr.io/idaholab/malcolm/opensearch:23.11.0
# Technically the "hedgehog" profile doesn't have OpenSearch, but in that case
# OPENSEARCH_PRIMARY will be set to remote, which means the container will
# start but not actually run OpenSearch. It's included in both profiles to
Expand Down Expand Up @@ -42,7 +42,7 @@ services:
retries: 3
start_period: 180s
dashboards-helper:
image: ghcr.io/idaholab/malcolm/dashboards-helper:23.10.0
image: ghcr.io/idaholab/malcolm/dashboards-helper:23.11.0
profiles: ["malcolm"]
restart: "no"
stdin_open: false
Expand Down Expand Up @@ -71,7 +71,7 @@ services:
retries: 3
start_period: 30s
dashboards:
image: ghcr.io/idaholab/malcolm/dashboards:23.10.0
image: ghcr.io/idaholab/malcolm/dashboards:23.11.0
profiles: ["malcolm"]
restart: "no"
stdin_open: false
Expand All @@ -98,7 +98,7 @@ services:
retries: 3
start_period: 210s
logstash:
image: ghcr.io/idaholab/malcolm/logstash-oss:23.10.0
image: ghcr.io/idaholab/malcolm/logstash-oss:23.11.0
profiles: ["malcolm"]
restart: "no"
stdin_open: false
Expand Down Expand Up @@ -141,7 +141,7 @@ services:
retries: 3
start_period: 600s
filebeat:
image: ghcr.io/idaholab/malcolm/filebeat-oss:23.10.0
image: ghcr.io/idaholab/malcolm/filebeat-oss:23.11.0
profiles: ["malcolm", "hedgehog"]
restart: "no"
stdin_open: false
Expand Down Expand Up @@ -175,7 +175,7 @@ services:
retries: 3
start_period: 60s
arkime:
image: ghcr.io/idaholab/malcolm/arkime:23.10.0
image: ghcr.io/idaholab/malcolm/arkime:23.11.0
# todo: viewer/wise in hedgehog profile (and what about nginx reaching back?)
profiles: ["malcolm", "hedgehog"]
restart: "no"
Expand Down Expand Up @@ -215,7 +215,7 @@ services:
retries: 3
start_period: 210s
zeek:
image: ghcr.io/idaholab/malcolm/zeek:23.10.0
image: ghcr.io/idaholab/malcolm/zeek:23.11.0
profiles: ["malcolm", "hedgehog"]
restart: "no"
stdin_open: false
Expand Down Expand Up @@ -254,7 +254,7 @@ services:
retries: 3
start_period: 60s
zeek-live:
image: ghcr.io/idaholab/malcolm/zeek:23.10.0
image: ghcr.io/idaholab/malcolm/zeek:23.11.0
profiles: ["malcolm", "hedgehog"]
restart: "no"
stdin_open: false
Expand Down Expand Up @@ -283,7 +283,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.10.0
image: ghcr.io/idaholab/malcolm/suricata:23.11.0
profiles: ["malcolm", "hedgehog"]
restart: "no"
stdin_open: false
Expand Down Expand Up @@ -318,7 +318,7 @@ services:
retries: 3
start_period: 120s
suricata-live:
image: ghcr.io/idaholab/malcolm/suricata:23.10.0
image: ghcr.io/idaholab/malcolm/suricata:23.11.0
profiles: ["malcolm", "hedgehog"]
restart: "no"
stdin_open: false
Expand All @@ -345,7 +345,7 @@ services:
- ./suricata-logs:/var/log/suricata
- ./suricata/rules:/opt/suricata/rules:ro
file-monitor:
image: ghcr.io/idaholab/malcolm/file-monitor:23.10.0
image: ghcr.io/idaholab/malcolm/file-monitor:23.11.0
profiles: ["malcolm", "hedgehog"]
restart: "no"
stdin_open: false
Expand All @@ -372,7 +372,7 @@ services:
retries: 3
start_period: 60s
pcap-capture:
image: ghcr.io/idaholab/malcolm/pcap-capture:23.10.0
image: ghcr.io/idaholab/malcolm/pcap-capture:23.11.0
profiles: ["malcolm", "hedgehog"]
restart: "no"
stdin_open: false
Expand All @@ -395,7 +395,7 @@ services:
- ./nginx/ca-trust:/var/local/ca-trust:ro
- ./pcap/upload:/pcap
pcap-monitor:
image: ghcr.io/idaholab/malcolm/pcap-monitor:23.10.0
image: ghcr.io/idaholab/malcolm/pcap-monitor:23.11.0
profiles: ["malcolm", "hedgehog"]
restart: "no"
stdin_open: false
Expand All @@ -422,7 +422,7 @@ services:
retries: 3
start_period: 90s
upload:
image: ghcr.io/idaholab/malcolm/file-upload:23.10.0
image: ghcr.io/idaholab/malcolm/file-upload:23.11.0
profiles: ["malcolm"]
restart: "no"
stdin_open: false
Expand All @@ -448,7 +448,7 @@ services:
retries: 3
start_period: 60s
htadmin:
image: ghcr.io/idaholab/malcolm/htadmin:23.10.0
image: ghcr.io/idaholab/malcolm/htadmin:23.11.0
profiles: ["malcolm"]
restart: "no"
stdin_open: false
Expand All @@ -474,7 +474,7 @@ services:
retries: 3
start_period: 60s
freq:
image: ghcr.io/idaholab/malcolm/freq:23.10.0
image: ghcr.io/idaholab/malcolm/freq:23.11.0
profiles: ["malcolm"]
restart: "no"
stdin_open: false
Expand All @@ -497,7 +497,7 @@ services:
retries: 3
start_period: 60s
netbox:
image: ghcr.io/idaholab/malcolm/netbox:23.10.0
image: ghcr.io/idaholab/malcolm/netbox:23.11.0
profiles: ["malcolm"]
restart: "no"
stdin_open: false
Expand Down Expand Up @@ -530,7 +530,7 @@ services:
retries: 3
start_period: 120s
netbox-postgres:
image: ghcr.io/idaholab/malcolm/postgresql:23.10.0
image: ghcr.io/idaholab/malcolm/postgresql:23.11.0
profiles: ["malcolm"]
restart: "no"
stdin_open: false
Expand All @@ -555,7 +555,7 @@ services:
retries: 3
start_period: 45s
netbox-redis:
image: ghcr.io/idaholab/malcolm/redis:23.10.0
image: ghcr.io/idaholab/malcolm/redis:23.11.0
profiles: ["malcolm"]
restart: "no"
stdin_open: false
Expand Down Expand Up @@ -584,7 +584,7 @@ services:
retries: 3
start_period: 45s
netbox-redis-cache:
image: ghcr.io/idaholab/malcolm/redis:23.10.0
image: ghcr.io/idaholab/malcolm/redis:23.11.0
profiles: ["malcolm"]
restart: "no"
stdin_open: false
Expand Down Expand Up @@ -612,7 +612,7 @@ services:
retries: 3
start_period: 45s
api:
image: ghcr.io/idaholab/malcolm/api:23.10.0
image: ghcr.io/idaholab/malcolm/api:23.11.0
profiles: ["malcolm"]
command: gunicorn --bind 0:5000 manage:app
restart: "no"
Expand All @@ -638,7 +638,7 @@ services:
retries: 3
start_period: 60s
nginx-proxy:
image: ghcr.io/idaholab/malcolm/nginx-proxy:23.10.0
image: ghcr.io/idaholab/malcolm/nginx-proxy:23.11.0
profiles: ["malcolm"]
restart: "no"
stdin_open: false
Expand Down
44 changes: 22 additions & 22 deletions docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ services:
build:
context: .
dockerfile: Dockerfiles/opensearch.Dockerfile
image: ghcr.io/idaholab/malcolm/opensearch:23.10.0
image: ghcr.io/idaholab/malcolm/opensearch:23.11.0
# Technically the "hedgehog" profile doesn't have OpenSearch, but in that case
# OPENSEARCH_PRIMARY will be set to remote, which means the container will
# start but not actually run OpenSearch. It's included in both profiles to
Expand Down Expand Up @@ -48,7 +48,7 @@ services:
build:
context: .
dockerfile: Dockerfiles/dashboards-helper.Dockerfile
image: ghcr.io/idaholab/malcolm/dashboards-helper:23.10.0
image: ghcr.io/idaholab/malcolm/dashboards-helper:23.11.0
profiles: ["malcolm"]
restart: "no"
stdin_open: false
Expand Down Expand Up @@ -80,7 +80,7 @@ services:
build:
context: .
dockerfile: Dockerfiles/dashboards.Dockerfile
image: ghcr.io/idaholab/malcolm/dashboards:23.10.0
image: ghcr.io/idaholab/malcolm/dashboards:23.11.0
profiles: ["malcolm"]
restart: "no"
stdin_open: false
Expand Down Expand Up @@ -110,7 +110,7 @@ services:
build:
context: .
dockerfile: Dockerfiles/logstash.Dockerfile
image: ghcr.io/idaholab/malcolm/logstash-oss:23.10.0
image: ghcr.io/idaholab/malcolm/logstash-oss:23.11.0
profiles: ["malcolm"]
restart: "no"
stdin_open: false
Expand Down Expand Up @@ -160,7 +160,7 @@ services:
build:
context: .
dockerfile: Dockerfiles/filebeat.Dockerfile
image: ghcr.io/idaholab/malcolm/filebeat-oss:23.10.0
image: ghcr.io/idaholab/malcolm/filebeat-oss:23.11.0
profiles: ["malcolm", "hedgehog"]
restart: "no"
stdin_open: false
Expand Down Expand Up @@ -197,7 +197,7 @@ services:
build:
context: .
dockerfile: Dockerfiles/arkime.Dockerfile
image: ghcr.io/idaholab/malcolm/arkime:23.10.0
image: ghcr.io/idaholab/malcolm/arkime:23.11.0
# todo: viewer/wise in hedgehog profile (and what about nginx reaching back?)
profiles: ["malcolm", "hedgehog"]
restart: "no"
Expand Down Expand Up @@ -243,7 +243,7 @@ services:
build:
context: .
dockerfile: Dockerfiles/zeek.Dockerfile
image: ghcr.io/idaholab/malcolm/zeek:23.10.0
image: ghcr.io/idaholab/malcolm/zeek:23.11.0
profiles: ["malcolm", "hedgehog"]
restart: "no"
stdin_open: false
Expand Down Expand Up @@ -286,7 +286,7 @@ services:
build:
context: .
dockerfile: Dockerfiles/zeek.Dockerfile
image: ghcr.io/idaholab/malcolm/zeek:23.10.0
image: ghcr.io/idaholab/malcolm/zeek:23.11.0
profiles: ["malcolm", "hedgehog"]
restart: "no"
stdin_open: false
Expand Down Expand Up @@ -319,7 +319,7 @@ services:
build:
context: .
dockerfile: Dockerfiles/suricata.Dockerfile
image: ghcr.io/idaholab/malcolm/suricata:23.10.0
image: ghcr.io/idaholab/malcolm/suricata:23.11.0
profiles: ["malcolm", "hedgehog"]
restart: "no"
stdin_open: false
Expand Down Expand Up @@ -357,7 +357,7 @@ services:
build:
context: .
dockerfile: Dockerfiles/suricata.Dockerfile
image: ghcr.io/idaholab/malcolm/suricata:23.10.0
image: ghcr.io/idaholab/malcolm/suricata:23.11.0
profiles: ["malcolm", "hedgehog"]
restart: "no"
stdin_open: false
Expand Down Expand Up @@ -387,7 +387,7 @@ services:
build:
context: .
dockerfile: Dockerfiles/file-monitor.Dockerfile
image: ghcr.io/idaholab/malcolm/file-monitor:23.10.0
image: ghcr.io/idaholab/malcolm/file-monitor:23.11.0
profiles: ["malcolm", "hedgehog"]
restart: "no"
stdin_open: false
Expand Down Expand Up @@ -417,7 +417,7 @@ services:
build:
context: .
dockerfile: Dockerfiles/pcap-capture.Dockerfile
image: ghcr.io/idaholab/malcolm/pcap-capture:23.10.0
image: ghcr.io/idaholab/malcolm/pcap-capture:23.11.0
profiles: ["malcolm", "hedgehog"]
restart: "no"
stdin_open: false
Expand All @@ -443,7 +443,7 @@ services:
build:
context: .
dockerfile: Dockerfiles/pcap-monitor.Dockerfile
image: ghcr.io/idaholab/malcolm/pcap-monitor:23.10.0
image: ghcr.io/idaholab/malcolm/pcap-monitor:23.11.0
profiles: ["malcolm", "hedgehog"]
restart: "no"
stdin_open: false
Expand Down Expand Up @@ -473,7 +473,7 @@ services:
build:
context: .
dockerfile: Dockerfiles/file-upload.Dockerfile
image: ghcr.io/idaholab/malcolm/file-upload:23.10.0
image: ghcr.io/idaholab/malcolm/file-upload:23.11.0
profiles: ["malcolm"]
restart: "no"
stdin_open: false
Expand All @@ -499,7 +499,7 @@ services:
retries: 3
start_period: 60s
htadmin:
image: ghcr.io/idaholab/malcolm/htadmin:23.10.0
image: ghcr.io/idaholab/malcolm/htadmin:23.11.0
profiles: ["malcolm"]
build:
context: .
Expand Down Expand Up @@ -528,7 +528,7 @@ services:
retries: 3
start_period: 60s
freq:
image: ghcr.io/idaholab/malcolm/freq:23.10.0
image: ghcr.io/idaholab/malcolm/freq:23.11.0
profiles: ["malcolm"]
build:
context: .
Expand All @@ -554,7 +554,7 @@ services:
retries: 3
start_period: 60s
netbox:
image: ghcr.io/idaholab/malcolm/netbox:23.10.0
image: ghcr.io/idaholab/malcolm/netbox:23.11.0
profiles: ["malcolm"]
build:
context: .
Expand Down Expand Up @@ -590,7 +590,7 @@ services:
retries: 3
start_period: 120s
netbox-postgres:
image: ghcr.io/idaholab/malcolm/postgresql:23.10.0
image: ghcr.io/idaholab/malcolm/postgresql:23.11.0
profiles: ["malcolm"]
build:
context: .
Expand Down Expand Up @@ -618,7 +618,7 @@ services:
retries: 3
start_period: 45s
netbox-redis:
image: ghcr.io/idaholab/malcolm/redis:23.10.0
image: ghcr.io/idaholab/malcolm/redis:23.11.0
profiles: ["malcolm"]
build:
context: .
Expand Down Expand Up @@ -650,7 +650,7 @@ services:
retries: 3
start_period: 45s
netbox-redis-cache:
image: ghcr.io/idaholab/malcolm/redis:23.10.0
image: ghcr.io/idaholab/malcolm/redis:23.11.0
profiles: ["malcolm"]
build:
context: .
Expand Down Expand Up @@ -681,7 +681,7 @@ services:
retries: 3
start_period: 45s
api:
image: ghcr.io/idaholab/malcolm/api:23.10.0
image: ghcr.io/idaholab/malcolm/api:23.11.0
profiles: ["malcolm"]
build:
context: .
Expand Down Expand Up @@ -713,7 +713,7 @@ services:
build:
context: .
dockerfile: Dockerfiles/nginx.Dockerfile
image: ghcr.io/idaholab/malcolm/nginx-proxy:23.10.0
image: ghcr.io/idaholab/malcolm/nginx-proxy:23.11.0
profiles: ["malcolm"]
restart: "no"
stdin_open: false
Expand Down
Loading

0 comments on commit fa17a78

Please sign in to comment.