Allow additional docker parameters

This commit is contained in:
Mike Reeves
2023-05-18 16:46:28 -04:00
parent c0dc05f26a
commit 8917f9b9d2
5 changed files with 10 additions and 10 deletions

View File

@@ -40,8 +40,8 @@ so-elasticsearch:
- memlock=-1:-1 - memlock=-1:-1
- nofile=65536:65536 - nofile=65536:65536
- nproc=4096 - nproc=4096
{% if DOCKER.containers['so-elastalert'].extra_env %} {% if DOCKER.containers['so-elasticsearch'].extra_env %}
{% for XTRAENV in DOCKER.containers['so-elastalert'].extra_env %} {% for XTRAENV in DOCKER.containers['so-elasticsearch'].extra_env %}
- {{ XTRAENV }} - {{ XTRAENV }}
{% enfor %} {% enfor %}
{% endif %} {% endif %}

View File

@@ -31,9 +31,9 @@ so-idstools:
- {{ XTRAENV }} - {{ XTRAENV }}
{% enfor %} {% enfor %}
{% endif %} {% endif %}
{% elif DOCKER.containers['so-elastalert'].extra_env %} {% elif DOCKER.containers['so-idstools'].extra_env %}
- environment: - environment:
{% for XTRAENV in DOCKER.containers['so-elastalert'].extra_env %} {% for XTRAENV in DOCKER.containers['so-idstools'].extra_env %}
- {{ XTRAENV }} - {{ XTRAENV }}
{% enfor %} {% enfor %}
{% endif %} {% endif %}

View File

@@ -4,7 +4,7 @@
# Pull down the latest rules if not airgap # Pull down the latest rules if not airgap
docker exec so-idstools idstools-rulecat -v --suricata-version 6.0 -o /nsm/rules/suricata/ --force #docker exec so-idstools idstools-rulecat -v --suricata-version 6.0 -o /nsm/rules/suricata/ --force
argstr="" argstr=""
for arg in "$@"; do for arg in "$@"; do

View File

@@ -42,7 +42,7 @@ so-playbook:
- extra_hosts: - extra_hosts:
- {{ GLOBALS.manager }}:{{ GLOBALS.manager_ip }} - {{ GLOBALS.manager }}:{{ GLOBALS.manager_ip }}
{% if DOCKER.containers['so-playbook'].extra_hosts %} {% if DOCKER.containers['so-playbook'].extra_hosts %}
{% for XTRAHOST in DOCKER.containers['so-kratos'].extra_hosts %} {% for XTRAHOST in DOCKER.containers['so-playbook'].extra_hosts %}
- {{ XTRAHOST }} - {{ XTRAHOST }}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
@@ -51,8 +51,8 @@ so-playbook:
- REDMINE_DB_DATABASE=playbook - REDMINE_DB_DATABASE=playbook
- REDMINE_DB_USERNAME=playbookdbuser - REDMINE_DB_USERNAME=playbookdbuser
- REDMINE_DB_PASSWORD={{ PLAYBOOKPASS }} - REDMINE_DB_PASSWORD={{ PLAYBOOKPASS }}
{% if DOCKER.containers['so-kratos'].extra_env %} {% if DOCKER.containers['so-playbook'].extra_env %}
{% for XTRAENV in DOCKER.containers['so-kratos'].extra_env %} {% for XTRAENV in DOCKER.containers['so-playbook'].extra_env %}
- {{ XTRAENV }} - {{ XTRAENV }}
{% enfor %} {% enfor %}
{% endif %} {% endif %}

View File

@@ -44,8 +44,8 @@ so-dockerregistry:
- client_timeout: 180 - client_timeout: 180
- environment: - environment:
- HOME=/root - HOME=/root
{% if DOCKER.containers['so-kratos'].extra_env %} {% if DOCKER.containers['so-dockerregistry'].extra_env %}
{% for XTRAENV in DOCKER.containers['so-kratos'].extra_env %} {% for XTRAENV in DOCKER.containers['so-dockerregistry'].extra_env %}
- {{ XTRAENV }} - {{ XTRAENV }}
{% enfor %} {% enfor %}
{% endif %} {% endif %}