Skip to content

Commit

Permalink
as it's Nov 30th and the fix for idaholab#298 isn't out yet, renaming…
Browse files Browse the repository at this point in the history
… the release to v23.12.0
  • Loading branch information
mmguero committed Nov 30, 2023
1 parent 6861469 commit b499390
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
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ x-logging:

services:
opensearch:
image: ghcr.io/idaholab/malcolm/opensearch:23.11.0
image: ghcr.io/idaholab/malcolm/opensearch:23.12.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 @@ -51,7 +51,7 @@ services:
retries: 3
start_period: 180s
dashboards-helper:
image: ghcr.io/idaholab/malcolm/dashboards-helper:23.11.0
image: ghcr.io/idaholab/malcolm/dashboards-helper:23.12.0
profiles: ["malcolm"]
logging: *default-logging
restart: "no"
Expand Down Expand Up @@ -81,7 +81,7 @@ services:
retries: 3
start_period: 30s
dashboards:
image: ghcr.io/idaholab/malcolm/dashboards:23.11.0
image: ghcr.io/idaholab/malcolm/dashboards:23.12.0
profiles: ["malcolm"]
logging: *default-logging
restart: "no"
Expand Down Expand Up @@ -109,7 +109,7 @@ services:
retries: 3
start_period: 210s
logstash:
image: ghcr.io/idaholab/malcolm/logstash-oss:23.11.0
image: ghcr.io/idaholab/malcolm/logstash-oss:23.12.0
profiles: ["malcolm"]
logging: *default-logging
restart: "no"
Expand Down Expand Up @@ -153,7 +153,7 @@ services:
retries: 3
start_period: 600s
filebeat:
image: ghcr.io/idaholab/malcolm/filebeat-oss:23.11.0
image: ghcr.io/idaholab/malcolm/filebeat-oss:23.12.0
profiles: ["malcolm", "hedgehog"]
logging: *default-logging
restart: "no"
Expand Down Expand Up @@ -188,7 +188,7 @@ services:
retries: 3
start_period: 60s
arkime:
image: ghcr.io/idaholab/malcolm/arkime:23.11.0
image: ghcr.io/idaholab/malcolm/arkime:23.12.0
profiles: ["malcolm", "hedgehog"]
logging: *default-logging
restart: "no"
Expand Down Expand Up @@ -228,7 +228,7 @@ services:
retries: 3
start_period: 210s
zeek:
image: ghcr.io/idaholab/malcolm/zeek:23.11.0
image: ghcr.io/idaholab/malcolm/zeek:23.12.0
profiles: ["malcolm", "hedgehog"]
logging: *default-logging
restart: "no"
Expand Down Expand Up @@ -269,7 +269,7 @@ services:
retries: 3
start_period: 60s
zeek-live:
image: ghcr.io/idaholab/malcolm/zeek:23.11.0
image: ghcr.io/idaholab/malcolm/zeek:23.12.0
profiles: ["malcolm", "hedgehog"]
logging: *default-logging
restart: "no"
Expand Down Expand Up @@ -300,7 +300,7 @@ services:
- ./zeek/intel:/opt/zeek/share/zeek/site/intel
- ./zeek/custom:/opt/zeek/share/zeek/site/custom:ro
suricata:
image: ghcr.io/idaholab/malcolm/suricata:23.11.0
image: ghcr.io/idaholab/malcolm/suricata:23.12.0
profiles: ["malcolm", "hedgehog"]
logging: *default-logging
restart: "no"
Expand Down Expand Up @@ -337,7 +337,7 @@ services:
retries: 3
start_period: 120s
suricata-live:
image: ghcr.io/idaholab/malcolm/suricata:23.11.0
image: ghcr.io/idaholab/malcolm/suricata:23.12.0
profiles: ["malcolm", "hedgehog"]
logging: *default-logging
restart: "no"
Expand Down Expand Up @@ -366,7 +366,7 @@ services:
- ./suricata/rules:/opt/suricata/rules:ro
- ./suricata/include-configs:/opt/suricata/include-configs:ro
file-monitor:
image: ghcr.io/idaholab/malcolm/file-monitor:23.11.0
image: ghcr.io/idaholab/malcolm/file-monitor:23.12.0
profiles: ["malcolm", "hedgehog"]
logging: *default-logging
restart: "no"
Expand Down Expand Up @@ -394,7 +394,7 @@ services:
retries: 3
start_period: 60s
pcap-capture:
image: ghcr.io/idaholab/malcolm/pcap-capture:23.11.0
image: ghcr.io/idaholab/malcolm/pcap-capture:23.12.0
profiles: ["malcolm", "hedgehog"]
logging: *default-logging
restart: "no"
Expand All @@ -418,7 +418,7 @@ services:
- ./nginx/ca-trust:/var/local/ca-trust:ro
- ./pcap/upload:/pcap
pcap-monitor:
image: ghcr.io/idaholab/malcolm/pcap-monitor:23.11.0
image: ghcr.io/idaholab/malcolm/pcap-monitor:23.12.0
profiles: ["malcolm", "hedgehog"]
logging: *default-logging
restart: "no"
Expand Down Expand Up @@ -446,7 +446,7 @@ services:
retries: 3
start_period: 90s
upload:
image: ghcr.io/idaholab/malcolm/file-upload:23.11.0
image: ghcr.io/idaholab/malcolm/file-upload:23.12.0
profiles: ["malcolm"]
logging: *default-logging
restart: "no"
Expand All @@ -473,7 +473,7 @@ services:
retries: 3
start_period: 60s
htadmin:
image: ghcr.io/idaholab/malcolm/htadmin:23.11.0
image: ghcr.io/idaholab/malcolm/htadmin:23.12.0
profiles: ["malcolm"]
logging: *default-logging
restart: "no"
Expand All @@ -500,7 +500,7 @@ services:
retries: 3
start_period: 60s
freq:
image: ghcr.io/idaholab/malcolm/freq:23.11.0
image: ghcr.io/idaholab/malcolm/freq:23.12.0
profiles: ["malcolm"]
logging: *default-logging
restart: "no"
Expand All @@ -524,7 +524,7 @@ services:
retries: 3
start_period: 60s
netbox:
image: ghcr.io/idaholab/malcolm/netbox:23.11.0
image: ghcr.io/idaholab/malcolm/netbox:23.12.0
profiles: ["malcolm"]
logging: *default-logging
restart: "no"
Expand Down Expand Up @@ -558,7 +558,7 @@ services:
retries: 3
start_period: 120s
netbox-postgres:
image: ghcr.io/idaholab/malcolm/postgresql:23.11.0
image: ghcr.io/idaholab/malcolm/postgresql:23.12.0
profiles: ["malcolm"]
logging: *default-logging
restart: "no"
Expand All @@ -584,7 +584,7 @@ services:
retries: 3
start_period: 45s
netbox-redis:
image: ghcr.io/idaholab/malcolm/redis:23.11.0
image: ghcr.io/idaholab/malcolm/redis:23.12.0
profiles: ["malcolm"]
logging: *default-logging
restart: "no"
Expand Down Expand Up @@ -614,7 +614,7 @@ services:
retries: 3
start_period: 45s
netbox-redis-cache:
image: ghcr.io/idaholab/malcolm/redis:23.11.0
image: ghcr.io/idaholab/malcolm/redis:23.12.0
profiles: ["malcolm"]
logging: *default-logging
restart: "no"
Expand Down Expand Up @@ -643,7 +643,7 @@ services:
retries: 3
start_period: 45s
api:
image: ghcr.io/idaholab/malcolm/api:23.11.0
image: ghcr.io/idaholab/malcolm/api:23.12.0
profiles: ["malcolm"]
logging: *default-logging
command: gunicorn --bind 0:5000 manage:app
Expand All @@ -670,7 +670,7 @@ services:
retries: 3
start_period: 60s
nginx-proxy:
image: ghcr.io/idaholab/malcolm/nginx-proxy:23.11.0
image: ghcr.io/idaholab/malcolm/nginx-proxy:23.12.0
profiles: ["malcolm"]
logging: *default-logging
restart: "no"
Expand Down
44 changes: 22 additions & 22 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ services:
build:
context: .
dockerfile: Dockerfiles/opensearch.Dockerfile
image: ghcr.io/idaholab/malcolm/opensearch:23.11.0
image: ghcr.io/idaholab/malcolm/opensearch:23.12.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 @@ -57,7 +57,7 @@ services:
build:
context: .
dockerfile: Dockerfiles/dashboards-helper.Dockerfile
image: ghcr.io/idaholab/malcolm/dashboards-helper:23.11.0
image: ghcr.io/idaholab/malcolm/dashboards-helper:23.12.0
profiles: ["malcolm"]
logging: *default-logging
restart: "no"
Expand Down Expand Up @@ -90,7 +90,7 @@ services:
build:
context: .
dockerfile: Dockerfiles/dashboards.Dockerfile
image: ghcr.io/idaholab/malcolm/dashboards:23.11.0
image: ghcr.io/idaholab/malcolm/dashboards:23.12.0
profiles: ["malcolm"]
logging: *default-logging
restart: "no"
Expand Down Expand Up @@ -121,7 +121,7 @@ services:
build:
context: .
dockerfile: Dockerfiles/logstash.Dockerfile
image: ghcr.io/idaholab/malcolm/logstash-oss:23.11.0
image: ghcr.io/idaholab/malcolm/logstash-oss:23.12.0
profiles: ["malcolm"]
logging: *default-logging
restart: "no"
Expand Down Expand Up @@ -172,7 +172,7 @@ services:
build:
context: .
dockerfile: Dockerfiles/filebeat.Dockerfile
image: ghcr.io/idaholab/malcolm/filebeat-oss:23.11.0
image: ghcr.io/idaholab/malcolm/filebeat-oss:23.12.0
profiles: ["malcolm", "hedgehog"]
logging: *default-logging
restart: "no"
Expand Down Expand Up @@ -210,7 +210,7 @@ services:
build:
context: .
dockerfile: Dockerfiles/arkime.Dockerfile
image: ghcr.io/idaholab/malcolm/arkime:23.11.0
image: ghcr.io/idaholab/malcolm/arkime:23.12.0
profiles: ["malcolm", "hedgehog"]
logging: *default-logging
restart: "no"
Expand Down Expand Up @@ -256,7 +256,7 @@ services:
build:
context: .
dockerfile: Dockerfiles/zeek.Dockerfile
image: ghcr.io/idaholab/malcolm/zeek:23.11.0
image: ghcr.io/idaholab/malcolm/zeek:23.12.0
profiles: ["malcolm", "hedgehog"]
logging: *default-logging
restart: "no"
Expand Down Expand Up @@ -301,7 +301,7 @@ services:
build:
context: .
dockerfile: Dockerfiles/zeek.Dockerfile
image: ghcr.io/idaholab/malcolm/zeek:23.11.0
image: ghcr.io/idaholab/malcolm/zeek:23.12.0
profiles: ["malcolm", "hedgehog"]
logging: *default-logging
restart: "no"
Expand Down Expand Up @@ -336,7 +336,7 @@ services:
build:
context: .
dockerfile: Dockerfiles/suricata.Dockerfile
image: ghcr.io/idaholab/malcolm/suricata:23.11.0
image: ghcr.io/idaholab/malcolm/suricata:23.12.0
profiles: ["malcolm", "hedgehog"]
logging: *default-logging
restart: "no"
Expand Down Expand Up @@ -376,7 +376,7 @@ services:
build:
context: .
dockerfile: Dockerfiles/suricata.Dockerfile
image: ghcr.io/idaholab/malcolm/suricata:23.11.0
image: ghcr.io/idaholab/malcolm/suricata:23.12.0
profiles: ["malcolm", "hedgehog"]
logging: *default-logging
restart: "no"
Expand Down Expand Up @@ -408,7 +408,7 @@ services:
build:
context: .
dockerfile: Dockerfiles/file-monitor.Dockerfile
image: ghcr.io/idaholab/malcolm/file-monitor:23.11.0
image: ghcr.io/idaholab/malcolm/file-monitor:23.12.0
profiles: ["malcolm", "hedgehog"]
logging: *default-logging
restart: "no"
Expand Down Expand Up @@ -439,7 +439,7 @@ services:
build:
context: .
dockerfile: Dockerfiles/pcap-capture.Dockerfile
image: ghcr.io/idaholab/malcolm/pcap-capture:23.11.0
image: ghcr.io/idaholab/malcolm/pcap-capture:23.12.0
profiles: ["malcolm", "hedgehog"]
logging: *default-logging
restart: "no"
Expand All @@ -466,7 +466,7 @@ services:
build:
context: .
dockerfile: Dockerfiles/pcap-monitor.Dockerfile
image: ghcr.io/idaholab/malcolm/pcap-monitor:23.11.0
image: ghcr.io/idaholab/malcolm/pcap-monitor:23.12.0
profiles: ["malcolm", "hedgehog"]
logging: *default-logging
restart: "no"
Expand Down Expand Up @@ -497,7 +497,7 @@ services:
build:
context: .
dockerfile: Dockerfiles/file-upload.Dockerfile
image: ghcr.io/idaholab/malcolm/file-upload:23.11.0
image: ghcr.io/idaholab/malcolm/file-upload:23.12.0
profiles: ["malcolm"]
logging: *default-logging
restart: "no"
Expand All @@ -524,7 +524,7 @@ services:
retries: 3
start_period: 60s
htadmin:
image: ghcr.io/idaholab/malcolm/htadmin:23.11.0
image: ghcr.io/idaholab/malcolm/htadmin:23.12.0
profiles: ["malcolm"]
logging: *default-logging
build:
Expand Down Expand Up @@ -554,7 +554,7 @@ services:
retries: 3
start_period: 60s
freq:
image: ghcr.io/idaholab/malcolm/freq:23.11.0
image: ghcr.io/idaholab/malcolm/freq:23.12.0
profiles: ["malcolm"]
logging: *default-logging
build:
Expand All @@ -581,7 +581,7 @@ services:
retries: 3
start_period: 60s
netbox:
image: ghcr.io/idaholab/malcolm/netbox:23.11.0
image: ghcr.io/idaholab/malcolm/netbox:23.12.0
profiles: ["malcolm"]
logging: *default-logging
build:
Expand Down Expand Up @@ -618,7 +618,7 @@ services:
retries: 3
start_period: 120s
netbox-postgres:
image: ghcr.io/idaholab/malcolm/postgresql:23.11.0
image: ghcr.io/idaholab/malcolm/postgresql:23.12.0
profiles: ["malcolm"]
logging: *default-logging
build:
Expand Down Expand Up @@ -647,7 +647,7 @@ services:
retries: 3
start_period: 45s
netbox-redis:
image: ghcr.io/idaholab/malcolm/redis:23.11.0
image: ghcr.io/idaholab/malcolm/redis:23.12.0
profiles: ["malcolm"]
logging: *default-logging
build:
Expand Down Expand Up @@ -680,7 +680,7 @@ services:
retries: 3
start_period: 45s
netbox-redis-cache:
image: ghcr.io/idaholab/malcolm/redis:23.11.0
image: ghcr.io/idaholab/malcolm/redis:23.12.0
profiles: ["malcolm"]
logging: *default-logging
build:
Expand Down Expand Up @@ -712,7 +712,7 @@ services:
retries: 3
start_period: 45s
api:
image: ghcr.io/idaholab/malcolm/api:23.11.0
image: ghcr.io/idaholab/malcolm/api:23.12.0
profiles: ["malcolm"]
logging: *default-logging
build:
Expand Down Expand Up @@ -745,7 +745,7 @@ services:
build:
context: .
dockerfile: Dockerfiles/nginx.Dockerfile
image: ghcr.io/idaholab/malcolm/nginx-proxy:23.11.0
image: ghcr.io/idaholab/malcolm/nginx-proxy:23.12.0
profiles: ["malcolm"]
logging: *default-logging
restart: "no"
Expand Down
Loading

0 comments on commit b499390

Please sign in to comment.