Docker URL Fix - Issue #68

salt/bro/init.sls

@@ -92,13 +92,13 @@ localbrosync:
 
 so-communitybroimage:
  cmd.run:
-   - name: docker pull --disable-content-trust=false soshybridhunter/so-communitybro:HH1.0.3
+   - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-communitybro:HH1.0.3
 
 so-bro:
   docker_container.running:
     - require:
       - so-communitybroimage
-    - image: soshybridhunter/so-communitybro:HH1.0.3
+    - image: docker.io/soshybridhunter/so-communitybro:HH1.0.3
     - privileged: True
     - binds:
       - /nsm/bro/logs:/nsm/bro/logs:rw
@@ -125,13 +125,13 @@ localbrosync:
 
 so-broimage:
  cmd.run:
-   - name: docker pull --disable-content-trust=false soshybridhunter/so-bro:HH1.1.1
+   - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-bro:HH1.1.1
 
 so-bro:
   docker_container.running:
     - require:
       - so-broimage
-    - image: soshybridhunter/so-bro:HH1.1.1
+    - image: docker.io/soshybridhunter/so-bro:HH1.1.1
     - privileged: True
     - binds:
       - /nsm/bro/logs:/nsm/bro/logs:rw

salt/common/init.sls

@@ -116,13 +116,13 @@ nginxtmp:
 # Start the core docker
 so-coreimage:
  cmd.run:
-   - name: docker pull --disable-content-trust=false soshybridhunter/so-core:HH1.1.2
+   - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-core:HH1.1.2
 
 so-core:
   docker_container.running:
     - require:
       - so-coreimage
-    - image: soshybridhunter/so-core:HH1.1.2
+    - image: docker.io/soshybridhunter/so-core:HH1.1.2
     - hostname: so-core
     - user: socore
     - binds:
@@ -176,13 +176,13 @@ tgrafconf:
 
 so-telegrafimage:
  cmd.run:
-   - name: docker pull --disable-content-trust=false soshybridhunter/so-telegraf:HH1.1.0
+   - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-telegraf:HH1.1.0
 
 so-telegraf:
   docker_container.running:
     - require:
       - so-telegrafimage
-    - image: soshybridhunter/so-telegraf:HH1.1.0
+    - image: docker.io/soshybridhunter/so-telegraf:HH1.1.0
     - environment:
       - HOST_PROC=/host/proc
       - HOST_ETC=/host/etc
@@ -237,13 +237,13 @@ influxdbconf:
 
 so-influximage:
  cmd.run:
-   - name: docker pull --disable-content-trust=false soshybridhunter/so-influxdb:HH1.1.0
+   - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-influxdb:HH1.1.0
 
 so-influxdb:
   docker_container.running:
     - require:
       - so-influximage
-    - image: soshybridhunter/so-influxdb:HH1.1.0
+    - image: docker.io/soshybridhunter/so-influxdb:HH1.1.0
     - hostname: influxdb
     - environment:
       - INFLUXDB_HTTP_LOG_ENABLED=false
@@ -402,11 +402,11 @@ dashboard-{{ SN }}:
 # Install the docker. This needs to be behind nginx at some point
 so-grafanaimage:
  cmd.run:
-   - name: docker pull --disable-content-trust=false soshybridhunter/so-grafana:HH1.1.0
+   - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-grafana:HH1.1.0
 
 so-grafana:
   docker_container.running:
-    - image: soshybridhunter/so-grafana:HH1.1.0
+    - image: docker.io/soshybridhunter/so-grafana:HH1.1.0
     - hostname: grafana
     - user: socore
     - binds:

salt/curator/init.sls

@@ -114,13 +114,13 @@ curdel:
 
 so-curatorimage:
  cmd.run:
-   - name: docker pull --disable-content-trust=false soshybridhunter/so-curator:HH1.1.0
+   - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-curator:HH1.1.0
 
 so-curator:
   docker_container.running:
     - require:
       - so-curatorimage
-    - image: soshybridhunter/so-curator:HH1.1.0
+    - image: docker.io/soshybridhunter/so-curator:HH1.1.0
     - hostname: curator
     - name: so-curator
     - user: curator

salt/elastalert/init.sls

@@ -111,13 +111,13 @@ elastaconf:
 
 so-elastalertimage:
  cmd.run:
-   - name: docker pull --disable-content-trust=false soshybridhunter/so-elastalert:HH1.1.1
+   - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-elastalert:HH1.1.1
 
 so-elastalert:
   docker_container.running:
     - require:
       - so-elastalertimage
-    - image: soshybridhunter/so-elastalert:HH1.1.1
+    - image: docker.io/soshybridhunter/so-elastalert:HH1.1.1
     - hostname: elastalert
     - name: so-elastalert
     - user: elastalert

salt/elasticsearch/init.sls

@@ -92,13 +92,13 @@ eslogdir:
 
 so-elasticsearchimage:
  cmd.run:
-   - name: docker pull --disable-content-trust=false soshybridhunter/so-elasticsearch:HH1.1.0
+   - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-elasticsearch:HH1.1.0
 
 so-elasticsearch:
   docker_container.running:
     - require:
       - so-elasticsearchimage
-    - image: soshybridhunter/so-elasticsearch:HH1.1.0
+    - image: docker.io/soshybridhunter/so-elasticsearch:HH1.1.0
     - hostname: elasticsearch
     - name: so-elasticsearch
     - user: elasticsearch
@@ -155,13 +155,13 @@ freqlogdir:
 
 so-freqimage:
  cmd.run:
-   - name: docker pull --disable-content-trust=false soshybridhunter/so-freqserver:HH1.0.3
+   - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-freqserver:HH1.0.3
 
 so-freq:
   docker_container.running:
     - require:
       - so-freqimage
-    - image: soshybridhunter/so-freqserver:HH1.0.3
+    - image: docker.io/soshybridhunter/so-freqserver:HH1.0.3
     - hostname: freqserver
     - name: so-freqserver
     - user: freqserver
@@ -197,13 +197,13 @@ dstatslogdir:
 
 so-domainstatsimage:
  cmd.run:
-   - name: docker pull --disable-content-trust=false soshybridhunter/so-domainstats:HH1.0.3
+   - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-domainstats:HH1.0.3
 
 so-domainstats:
   docker_container.running:
     - require:
       - so-domainstatsimage
-    - image: soshybridhunter/so-domainstats:HH1.0.3
+    - image: docker.io/soshybridhunter/so-domainstats:HH1.0.3
     - hostname: domainstats
     - name: so-domainstats
     - user: domainstats

salt/filebeat/init.sls

@@ -58,13 +58,13 @@ filebeatconfsync:
 
 so-filebeatimage:
  cmd.run:
-   - name: docker pull --disable-content-trust=false soshybridhunter/so-filebeat:HH1.1.1
+   - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-filebeat:HH1.1.1
 
 so-filebeat:
   docker_container.running:
     - require:
       - so-filebeatimage
-    - image: soshybridhunter/so-filebeat:HH1.1.1
+    - image: docker.io/soshybridhunter/so-filebeat:HH1.1.1
     - hostname: so-filebeat
     - user: root
     - extra_hosts: {{ MASTER }}:{{ MASTERIP }}

salt/fleet/init.sls

@@ -61,13 +61,13 @@ fleetdbpriv:
 
 so-fleetimage:
  cmd.run:
-   - name: docker pull --disable-content-trust=false soshybridhunter/so-fleet:HH1.1.0
+   - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-fleet:HH1.1.0
 
 so-fleet:
   docker_container.running:
     - require:
       - so-fleetimage
-    - image: soshybridhunter/so-fleet:HH1.1.0
+    - image: docker.io/soshybridhunter/so-fleet:HH1.1.0
     - hostname: so-fleet
     - port_bindings:
       - 0.0.0.0:8080:8080

salt/fleet/so-fleet-setup.sh

@@ -29,7 +29,7 @@ docker run \
   --rm \
   --mount type=bind,source=/opt/so/conf/fleet/packages,target=/output \
   --mount type=bind,source=/etc/pki/launcher.crt,target=/var/launcher/launcher.crt \
-  soshybridhunter/so-fleet-launcher:HH1.1.0 "$esecret" "$1":8080
+  docker.io/soshybridhunter/so-fleet-launcher:HH1.1.0 "$esecret" "$1":8080
 
 cp /opt/so/conf/fleet/packages/launcher.* /opt/so/saltstack/salt/launcher/packages/
 #Update timestamp on packages webpage

salt/hive/init.sls

@@ -33,13 +33,13 @@ hiveesdata:
 
 so-thehive-esimage:
  cmd.run:
-   - name: docker pull --disable-content-trust=false soshybridhunter/so-thehive-es:HH1.1.1
+   - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-thehive-es:HH1.1.1
 
 so-thehive-es:
   docker_container.running:
     - require:
       - so-thehive-esimage
-    - image: soshybridhunter/so-thehive-es:HH1.1.1
+    - image: docker.io/soshybridhunter/so-thehive-es:HH1.1.1
     - hostname: so-thehive-es
     - name: so-thehive-es
     - user: 939
@@ -68,7 +68,7 @@ so-thehive-es:
 
 #so-corteximage:
 # cmd.run:
-#   - name: docker pull --disable-content-trust=false soshybridhunter/so-cortex:HH1.0.3
+#   - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-cortex:HH1.0.3
 
 #so-cortex:
 #  docker_container.running:
@@ -80,13 +80,13 @@ so-thehive-es:
 
 so-thehiveimage:
  cmd.run:
-   - name: docker pull --disable-content-trust=false soshybridhunter/so-thehive:HH1.1.1
+   - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-thehive:HH1.1.1
 
 so-thehive:
   docker_container.running:
     - require:
       - so-thehiveimage
-    - image: soshybridhunter/so-thehive:HH1.1.1
+    - image: docker.io/soshybridhunter/so-thehive:HH1.1.1
     - environment:
       - ELASTICSEARCH_HOST={{ MASTERIP }}
     - hostname: so-thehive

salt/idstools/init.sls

@@ -63,13 +63,13 @@ ruleslink:
 
 so-idstoolsimage:
  cmd.run:
-   - name: docker pull --disable-content-trust=false soshybridhunter/so-idstools:HH1.1.0
+   - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-idstools:HH1.1.0
 
 so-idstools:
   docker_container.running:
     - require:
       - so-idstoolsimage
-    - image: soshybridhunter/so-idstools:HH1.1.0
+    - image: docker.io/soshybridhunter/so-idstools:HH1.1.0
     - hostname: so-idstools
     - user: socore
     - binds:

salt/kibana/init.sls

@@ -56,14 +56,14 @@ synckibanacustom:
 
 so-kibanaimage:
  cmd.run:
-   - name: docker pull --disable-content-trust=false soshybridhunter/so-kibana:HH1.1.1
+   - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-kibana:HH1.1.1
 
 # Start the kibana docker
 so-kibana:
   docker_container.running:
     - require:
       - so-kibanaimage
-    - image: soshybridhunter/so-kibana:HH1.1.1
+    - image: docker.io/soshybridhunter/so-kibana:HH1.1.1
     - hostname: kibana
     - user: kibana
     - environment:

salt/logstash/init.sls

@@ -148,13 +148,13 @@ lslogdir:
 # Add the container
 so-logstashimage:
  cmd.run:
-   - name: docker pull --disable-content-trust=false soshybridhunter/so-logstash:HH1.1.1
+   - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-logstash:HH1.1.1
 
 so-logstash:
   docker_container.running:
     - require:
       - so-logstashimage
-    - image: soshybridhunter/so-logstash:HH1.1.1
+    - image: docker.io/soshybridhunter/so-logstash:HH1.1.1
     - hostname: so-logstash
     - name: so-logstash
     - user: logstash

salt/master/init.sls

@@ -48,14 +48,14 @@ acngcopyconf:
 
 so-acngimage:
  cmd.run:
-   - name: docker pull --disable-content-trust=false soshybridhunter/so-acng:HH1.1.0
+   - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-acng:HH1.1.0
 
 # Install the apt-cacher-ng container
 so-aptcacherng:
   docker_container.running:
     - require:
       - so-acngimage
-    - image: soshybridhunter/so-acng:HH1.1.0
+    - image: docker.io/soshybridhunter/so-acng:HH1.1.0
     - hostname: so-acng
     - port_bindings:
       - 0.0.0.0:3142:3142

salt/mysql/init.sls

@@ -50,13 +50,13 @@ mysqldatadir:
 
 so-mysqlimage:
  cmd.run:
-   - name: docker pull --disable-content-trust=false soshybridhunter/so-mysql:HH1.1.0
+   - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-mysql:HH1.1.0
 
 so-mysql:
   docker_container.running:
     - require:
       - so-mysqlimage
-    - image: soshybridhunter/so-mysql:HH1.1.0
+    - image: docker.io/soshybridhunter/so-mysql:HH1.1.0
     - hostname: so-mysql
     - user: socore
     - port_bindings:

salt/pcap/init.sls

@@ -96,13 +96,13 @@ stenolog:
 
 so-stenoimage:
  cmd.run:
-   - name: docker pull --disable-content-trust=false soshybridhunter/so-steno:HH1.1.1
+   - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-steno:HH1.1.1
 
 so-steno:
   docker_container.running:
     - require:
       - so-stenoimage
-    - image: soshybridhunter/so-steno:HH1.1.1
+    - image: docker.io/soshybridhunter/so-steno:HH1.1.1
     - network_mode: host
     - privileged: True
     - port_bindings:

salt/playbook/init.sls

@@ -26,13 +26,13 @@ navigatorconfig:
 
 so-playbookimage:
   cmd.run:
-    - name: docker pull --disable-content-trust=false soshybridhunter/so-playbook:HH1.1.1
+    - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-playbook:HH1.1.1
 
 so-playbook:
   docker_container.running:
     - require:
       - so-playbookimage
-    - image: soshybridhunter/so-playbook:HH1.1.1
+    - image: docker.io/soshybridhunter/so-playbook:HH1.1.1
     - hostname: playbook
     - name: so-playbook
     - binds:
@@ -42,13 +42,13 @@ so-playbook:
 
 so-navigatorimage:
   cmd.run:
-    - name: docker pull --disable-content-trust=false soshybridhunter/so-navigator:HH1.1.1
+    - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-navigator:HH1.1.1
 
 so-navigator:
   docker_container.running:
     - require:
       - so-navigatorimage
-    - image: soshybridhunter/so-navigator:HH1.1.1
+    - image: docker.io/soshybridhunter/so-navigator:HH1.1.1
     - hostname: navigator
     - name: so-navigator
     - binds:

salt/redis/init.sls

@@ -46,13 +46,13 @@ redisconfsync:
 
 so-redisimage:
  cmd.run:
-   - name: docker pull --disable-content-trust=false soshybridhunter/so-redis:HH1.1.0
+   - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-redis:HH1.1.0
 
 so-redis:
   docker_container.running:
     - require:
       - so-redisimage
-    - image: soshybridhunter/so-redis:HH1.1.0
+    - image: docker.io/soshybridhunter/so-redis:HH1.1.0
     - hostname: so-redis
     - user: socore
     - port_bindings:

salt/sensoroni/init.sls

@@ -29,13 +29,13 @@ sensoronisync:
 
 so-sensoroniimage:
   cmd.run:
-    - name: docker pull --disable-content-trust=false soshybridhunter/so-sensoroni:HH1.1.1
+    - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-sensoroni:HH1.1.1
 
 so-sensoroni:
   docker_container.running:
     - require:
       - so-sensoroniimage
-    - image: soshybridhunter/so-sensoroni:HH1.1.1
+    - image: docker.io/soshybridhunter/so-sensoroni:HH1.1.1
     - hostname: sensoroni
     - name: so-sensoroni
     - binds:

salt/soctopus/init.sls

@@ -40,13 +40,13 @@ navigatordefaultlayer:
 
 so-soctopusimage:
   cmd.run:
-    - name: docker pull --disable-content-trust=false soshybridhunter/so-soctopus:HH1.1.1
+    - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-soctopus:HH1.1.1
 
 so-soctopus:
   docker_container.running:
     - require:
       - so-soctopusimage
-    - image: soshybridhunter/so-soctopus:HH1.1.1
+    - image: docker.io/soshybridhunter/so-soctopus:HH1.1.1
     - hostname: soctopus
     - name: so-soctopus
     - binds:

salt/suricata/init.sls

@@ -72,13 +72,13 @@ suriconfigsync:
 
 so-suricataimage:
  cmd.run:
-   - name: docker pull --disable-content-trust=false soshybridhunter/so-suricata:HH1.1.1
+   - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-suricata:HH1.1.1
 
 so-suricata:
   docker_container.running:
     - require:
       - so-suricataimage
-    - image: soshybridhunter/so-suricata:HH1.1.1
+    - image: docker.io/soshybridhunter/so-suricata:HH1.1.1
     - privileged: True
     - environment:
       - INTERFACE={{ interface }}

salt/wazuh/init.sls

@@ -64,13 +64,13 @@ wazuhagentregister:
 
 so-wazuhimage:
  cmd.run:
-   - name: docker pull --disable-content-trust=false soshybridhunter/so-wazuh:HH1.1.0
+   - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-wazuh:HH1.1.0
 
 so-wazuh:
   docker_container.running:
     - require:
       - so-wazuhimage
-    - image: soshybridhunter/so-wazuh:HH1.1.0
+    - image: docker.io/soshybridhunter/so-wazuh:HH1.1.0
     - hostname: {{HOSTNAME}}-wazuh-manager
     - name: so-wazuh
     - detach: True