From 4939884d93536f13d6b8266d263d742b8ea98338 Mon Sep 17 00:00:00 2001
From: Wes Lambert <wlambertts@gmail.com>
Date: Mon, 2 Mar 2020 22:15:55 +0000
Subject: [PATCH] Update Strelka init

---
 salt/strelka/init.sls | 51 +++++--------------------------------------
 1 file changed, 6 insertions(+), 45 deletions(-)

diff --git a/salt/strelka/init.sls b/salt/strelka/init.sls
index 803886d2b..3f3191583 100644
--- a/salt/strelka/init.sls
+++ b/salt/strelka/init.sls
@@ -54,36 +54,8 @@ strelkastagedir:
     - group: 939
     - makedirs: True
 
-
-so-strelka-frontendimage:
- cmd.run:
-   - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-strelka-frontend:HH1.1.5
-
-so-strelka-coordinatorimage:
- cmd.run:
-   - name: docker pull --disable-content-trust=false docker.io/redis:5.0.5-alpine3.10
-
-so-strelka-gatekeeperimage:
- cmd.run:
-   - name: docker pull --disable-content-trust=false docker.io/redis:5.0.5-alpine3.10
-
-so-strelka-backendimage:
- cmd.run:
-   - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-strelka-backend:HH1.1.5
-
-so-strelka-managerimage:
- cmd.run:
-   - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-strelka-manager:HH1.1.5
-
-so-strelka-backendimage:
- cmd.run:
-   - name: docker pull --disable-content-trust=false docker.io/soshybridhunter/so-strelka-backend:HH1.1.5
-
-
 strelka_coordinator:
   docker_container.running:
-    - require:
-      - so-strelka-coordinatorimage
     - image: docker.io/redis:5.0.5-alpine3.10
     - name: so-strelka-coordinator
     - command: redis-server --save "" --appendonly no
@@ -92,19 +64,15 @@ strelka_coordinator:
 
 strelka_gatekeeper:
   docker_container.running:
-    - require:
-      - so-strelka-gatekeeperimage
     - image: docker.io/redis:5.0.5-alpine3.10
     - name: so-strelka-gatekeeper
     - command: redis-server --save "" --appendonly no --maxmemory-policy allkeys-lru
     - port_bindings:
       - 0.0.0.0:6381:6379
-   
+
 strelka_frontend:
   docker_container.running:
-    - require:
-      - so-strelka-frontendimage
-    - image: docker.io/soshybridhunter/so-strelka-frontend:HH1.1.5 
+    - image: soshybridhunter/so-strelka-frontend:HH1.2.1
     - binds:
       - /opt/so/conf/strelka/frontend/:/etc/strelka/:ro
       - /opt/so/log/strelka/:/var/log/strelka/:rw
@@ -116,9 +84,7 @@ strelka_frontend:
 
 strelka_backend:
   docker_container.running:
-    - require:
-      - so-strelka-backendimage
-    - image: docker.io/soshybridhunter/so-strelka-backend:HH1.1.5
+    - image: soshybridhunter/so-strelka-backend:HH1.2.1
     - restart_policy: unless-stopped
     - binds:
       - /opt/so/conf/strelka/backend/:/etc/strelka/:ro
@@ -128,9 +94,7 @@ strelka_backend:
 
 strelka_manager:
   docker_container.running:
-    - require:
-      - so-strelka-managerimage
-    - image: docker.io/soshybridhunter/so-strelka-manager:HH1.1.5
+    - image: soshybridhunter/so-strelka-manager:HH1.2.1
     - binds:
       - /opt/so/conf/strelka/manager/:/etc/strelka/:ro
     - name: so-strelka-manager
@@ -138,12 +102,9 @@ strelka_manager:
 
 strelka_filestream:
   docker_container.running:
-    - require:
-      - so-strelka-filestreamimage
-    - image: docker.io/soshybridhunter/so-strelka-filestream:HH1.1.5   
-    - image: docker.io/wlambert/sfilestream:grpc
+    - image: soshybridhunter/so-strelka-filestream:HH1.2.1
     - binds:
       - /opt/so/conf/strelka/filestream/:/etc/strelka/:ro
       - /nsm/strelka:/nsm/strelka
     - name: so-strelka-filestream
-    - command: strelka-filestream
+    - command: strelka-filestream