Fix some contianer links

This commit is contained in:
Mike Reeves
2020-01-14 11:05:36 -05:00
parent aa3016d1b8
commit e141443238
10 changed files with 12 additions and 10 deletions

View File

@@ -172,7 +172,7 @@ tgrafconf:
so-telegraf: so-telegraf:
docker_container.running: docker_container.running:
- image: {{ MASTER }}/soshybridhunter/so-telegraf:HH{{ VERSION }} - image: {{ MASTER }}:5000/soshybridhunter/so-telegraf:HH{{ VERSION }}
- environment: - environment:
- HOST_PROC=/host/proc - HOST_PROC=/host/proc
- HOST_ETC=/host/etc - HOST_ETC=/host/etc

View File

@@ -108,7 +108,7 @@ eslogdir:
so-elasticsearch: so-elasticsearch:
docker_container.running: docker_container.running:
- image: {{ MASTER }}/soshybridhunter/so-elasticsearch:HH{{ VERSION }} - image: {{ MASTER }}:5000/soshybridhunter/so-elasticsearch:HH{{ VERSION }}
- hostname: elasticsearch - hostname: elasticsearch
- name: so-elasticsearch - name: so-elasticsearch
- user: elasticsearch - user: elasticsearch

View File

@@ -49,7 +49,7 @@ filebeatconfsync:
so-filebeat: so-filebeat:
docker_container.running: docker_container.running:
- image: {{ MASTER }}/soshybridhunter/so-filebeat:HH{{ VERSION }} - image: {{ MASTER }}:5000/soshybridhunter/so-filebeat:HH{{ VERSION }}
- hostname: so-filebeat - hostname: so-filebeat
- user: root - user: root
- extra_hosts: {{ MASTER }}:{{ MASTERIP }} - extra_hosts: {{ MASTER }}:{{ MASTERIP }}

View File

@@ -63,7 +63,7 @@ fleetdbpriv:
so-fleet: so-fleet:
docker_container.running: docker_container.running:
- image: {{ MASTER }}/soshybridhunter/so-fleet:HH{{ VERSION }} - image: {{ MASTER }}:5000/soshybridhunter/so-fleet:HH{{ VERSION }}
- hostname: so-fleet - hostname: so-fleet
- port_bindings: - port_bindings:
- 0.0.0.0:8080:8080 - 0.0.0.0:8080:8080

View File

@@ -64,7 +64,7 @@ ruleslink:
so-idstools: so-idstools:
docker_container.running: docker_container.running:
- image: {{ MASTER }}/soshybridhunter/so-idstools:HH{{ VERSION }} - image: {{ MASTER }}:5000/soshybridhunter/so-idstools:HH{{ VERSION }}
- hostname: so-idstools - hostname: so-idstools
- user: socore - user: socore
- binds: - binds:

View File

@@ -56,7 +56,7 @@ synckibanacustom:
# Start the kibana docker # Start the kibana docker
so-kibana: so-kibana:
docker_container.running: docker_container.running:
- image: {{ MASTER }}/soshybridhunter/so-kibana:HH{{ VERSION }} - image: {{ MASTER }}:5000/soshybridhunter/so-kibana:HH{{ VERSION }}
- hostname: kibana - hostname: kibana
- user: kibana - user: kibana
- environment: - environment:

View File

@@ -155,7 +155,7 @@ lslogdir:
so-logstash: so-logstash:
docker_container.running: docker_container.running:
- image: {{ MASTER }}/soshybridhunter/so-logstash:HH{{ VERSION }} - image: {{ MASTER }}:5000/soshybridhunter/so-logstash:HH{{ VERSION }}
- hostname: so-logstash - hostname: so-logstash
- name: so-logstash - name: so-logstash
- user: logstash - user: logstash

View File

@@ -1,4 +1,6 @@
{% set MASTERIP = salt['pillar.get']('master:mainip', '') %} {% set MASTERIP = salt['pillar.get']('master:mainip', '') %}
{% set VERSION = salt['pillar.get']('static:soversion', '1.1.4') %}
{% set MASTER = salt['grains.get']('master') %}
playbookdb: playbookdb:
file.managed: file.managed:
@@ -26,7 +28,7 @@ navigatorconfig:
so-playbook: so-playbook:
docker_container.running: docker_container.running:
- image: {{ MASTER }}/soshybridhunter/so-playbook:HH{{ VERSION }} - image: {{ MASTER }}:5000/soshybridhunter/so-playbook:HH{{ VERSION }}
- hostname: playbook - hostname: playbook
- name: so-playbook - name: so-playbook
- binds: - binds:

View File

@@ -32,7 +32,7 @@ sensoronisync:
so-sensoroni: so-sensoroni:
docker_container.running: docker_container.running:
- image: {{ MASTER }}/soshybridhunter/so-sensoroni:HH{{ VERSION }} - image: {{ MASTER }}:5000/soshybridhunter/so-sensoroni:HH{{ VERSION }}
- hostname: sensoroni - hostname: sensoroni
- name: so-sensoroni - name: so-sensoroni
- binds: - binds:

View File

@@ -74,7 +74,7 @@ suriconfigsync:
so-suricata: so-suricata:
docker_container.running: docker_container.running:
- image: {{ MASTER }}/soshybridhunter/so-suricata:HH{{ VERSION }} - image: {{ MASTER }}:5000/soshybridhunter/so-suricata:HH{{ VERSION }}
- privileged: True - privileged: True
- environment: - environment:
- INTERFACE={{ interface }} - INTERFACE={{ interface }}