Merge pull request StackStorm#80 from shusugmt/fix/redis-url

Fix redis URL in st2.conf
sidmohan1 · Dec 17, 2017 · 5c33e13 · 5c33e13
2 parents 2e1c8d5 + d2200dc
commit 5c33e13
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -68,6 +68,13 @@ services:
     volumes:
       - redis-volume:/data
     dns_search: .
+    command: [
+      "bash", "-c",
+      '
+       docker-entrypoint.sh
+       --requirepass "$$REDIS_PASSWORD"
+      '
+    ]
 
 volumes:
   mongo-volume:

diff --git a/images/stackstorm/bin/entrypoint.sh b/images/stackstorm/bin/entrypoint.sh
@@ -23,7 +23,7 @@ crudini --set ${ST2_CONF} mistral v2_base_url ${MISTRAL_BASE_URL}
 crudini --set ${ST2_CONF} messaging url \
   amqp://${RABBITMQ_DEFAULT_USER}:${RABBITMQ_DEFAULT_PASS}@${RABBITMQ_HOST}:${RABBITMQ_PORT}
 crudini --set ${ST2_CONF} coordination url \
-  redis://${REDIS_PASSWORD}@${REDIS_HOST}:${REDIS_PORT}
+  redis://:${REDIS_PASSWORD}@${REDIS_HOST}:${REDIS_PORT}
 crudini --set ${ST2_CONF} database host ${MONGO_HOST}
 crudini --set ${ST2_CONF} database port ${MONGO_PORT}
 if [ ! -z ${MONGO_DB} ]; then

diff --git a/runtime/compose-1ppc/docker-compose.yml b/runtime/compose-1ppc/docker-compose.yml
@@ -127,6 +127,13 @@ services:
     volumes:
       - redis-volume:/data
     dns_search: .
+    command: [
+      "bash", "-c",
+      '
+       docker-entrypoint.sh
+       --requirepass "$$REDIS_PASSWORD"
+      '
+    ]
 
 volumes:
   mongo-volume: