feat(security): Add redis config file related envs

New env added for redis' conf files related Closes: edgexfoundry#402 Signed-off-by: Jim Wang <[email protected]>
jim-wang-intel · Feb 3, 2021 · 6e273f2 · 6e273f2
1 parent 8289564
commit 6e273f2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/compose-builder/add-security.yml b/compose-builder/add-security.yml
@@ -27,6 +27,7 @@ volumes:
   postgres-config:
   # non-shared volumes
   postgres-data:
+  redis-config:
 
 services:
   security-bootstrapper:
@@ -54,8 +55,13 @@ services:
       - common-sec-stage-gate.env
     environment:
       SECRETSTORE_TOKENFILE: /tmp/edgex/secrets/edgex-security-bootstrap-redis/secrets-token.json
+      DATABASECONFIG_PATH: /redis/conf
+      DATABASECONFIG_NAME: redis.conf
+    tmpfs:
+      - /redis
     volumes:
       - edgex-init:/edgex-init:ro,z
+      - redis-config:/redis/conf:z
       - /tmp/edgex/secrets/edgex-security-bootstrap-redis:/tmp/edgex/secrets/edgex-security-bootstrap-redis:ro,z
     depends_on:
       - security-bootstrapper

diff --git a/compose-builder/common-sec-stage-gate.env b/compose-builder/common-sec-stage-gate.env
@@ -27,7 +27,7 @@ STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT=54322
 # this is intended to be the same as Database.Primary.Host/.Port for other services
 STAGEGATE_DATABASE_HOST=edgex-redis
 STAGEGATE_DATABASE_PORT=6379
-STAGEGATE_DATABASE_READYPORT=54323
+STAGEGATE_DATABASE_READYPORT=6379
 # this is intended to be the same as Registry.Host/.Port for other services
 STAGEGATE_REGISTRY_HOST=edgex-core-consul
 STAGEGATE_REGISTRY_PORT=8500