Skip to content

Commit 9367a53

Browse files
committed
Merge branch 'main' of https://github.com/mmguero-dev/Malcolm into staging
2 parents d70daf2 + ac223d3 commit 9367a53

File tree

2 files changed

+0
-20
lines changed

2 files changed

+0
-20
lines changed

docker-compose-dev.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -584,11 +584,6 @@ services:
584584
hostname: zeek
585585
networks:
586586
- default
587-
ulimits:
588-
# see cisagov/Malcolm#747
589-
nofile:
590-
soft: 65535
591-
hard: 65535
592587
env_file:
593588
- ./config/process.env
594589
- ./config/ssl.env
@@ -660,11 +655,6 @@ services:
660655
stdin_open: false
661656
tty: true
662657
network_mode: host
663-
ulimits:
664-
# see cisagov/Malcolm#747
665-
nofile:
666-
soft: 65535
667-
hard: 65535
668658
cap_add:
669659
# NET_ADMIN and NET_RAW - to turn on promiscuous mode and capture raw packets
670660
- NET_ADMIN

docker-compose.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -500,11 +500,6 @@ services:
500500
hostname: zeek
501501
networks:
502502
- default
503-
ulimits:
504-
# see cisagov/Malcolm#747
505-
nofile:
506-
soft: 65535
507-
hard: 65535
508503
env_file:
509504
- ./config/process.env
510505
- ./config/ssl.env
@@ -567,11 +562,6 @@ services:
567562
stdin_open: false
568563
tty: true
569564
network_mode: host
570-
ulimits:
571-
# see cisagov/Malcolm#747
572-
nofile:
573-
soft: 65535
574-
hard: 65535
575565
cap_add:
576566
# NET_ADMIN and NET_RAW - to turn on promiscuous mode and capture raw packets
577567
- NET_ADMIN

0 commit comments

Comments
 (0)