From 926a4d418066db5bc9b4e88a94df6ec92904600d Mon Sep 17 00:00:00 2001 From: Jim Wang Date: Wed, 3 Feb 2021 09:06:46 -0700 Subject: [PATCH 1/3] feat(security): Add redis config file related envs New env added for redis' conf files related Closes: #402 Signed-off-by: Jim Wang --- compose-builder/add-security.yml | 6 ++++++ compose-builder/common-sec-stage-gate.env | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/compose-builder/add-security.yml b/compose-builder/add-security.yml index 8bb1380..02d2fe6 100644 --- 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 index fe553ec..01fc38f 100644 --- 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 From 969e473bd4b1aa0d3fa1b3217aec9b73649b13e2 Mon Sep 17 00:00:00 2001 From: Jim Wang Date: Wed, 3 Feb 2021 10:41:04 -0700 Subject: [PATCH 2/3] feat(security): Change tmpfs to /run Address Bryon's comment about more standard temp. file system /run Signed-off-by: Jim Wang --- compose-builder/add-security.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compose-builder/add-security.yml b/compose-builder/add-security.yml index 02d2fe6..91f3d50 100644 --- a/compose-builder/add-security.yml +++ b/compose-builder/add-security.yml @@ -55,13 +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_PATH: /run/redis/conf DATABASECONFIG_NAME: redis.conf tmpfs: - - /redis + - /run volumes: - edgex-init:/edgex-init:ro,z - - redis-config:/redis/conf:z + - redis-config:/run/redis/conf:z - /tmp/edgex/secrets/edgex-security-bootstrap-redis:/tmp/edgex/secrets/edgex-security-bootstrap-redis:ro,z depends_on: - security-bootstrapper From ee62a58abcb814d0679d580fd4b9eac1a620502f Mon Sep 17 00:00:00 2001 From: Jim Wang Date: Mon, 8 Feb 2021 16:33:52 -0700 Subject: [PATCH 3/3] feat(build): Add updates from make build Added env changes from make build Signed-off-by: Jim Wang --- .../docker-compose-nexus-arm64.yml | 32 ++++++++++------- .../compose-files/docker-compose-nexus.yml | 32 ++++++++++------- .../taf/docker-compose-taf-nexus-arm64.yml | 36 +++++++++++-------- .../taf/docker-compose-taf-nexus.yml | 36 +++++++++++-------- .../docker-compose-taf-perf-nexus-arm64.yml | 32 ++++++++++------- .../taf/docker-compose-taf-perf-nexus.yml | 32 ++++++++++------- 6 files changed, 118 insertions(+), 82 deletions(-) diff --git a/releases/nightly-build/compose-files/docker-compose-nexus-arm64.yml b/releases/nightly-build/compose-files/docker-compose-nexus-arm64.yml index be1412f..4e11142 100644 --- a/releases/nightly-build/compose-files/docker-compose-nexus-arm64.yml +++ b/releases/nightly-build/compose-files/docker-compose-nexus-arm64.yml @@ -94,7 +94,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -136,7 +136,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -196,7 +196,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -239,6 +239,8 @@ services: CLIENTS_RULESENGINE_HOST: edgex-kuiper CLIENTS_SCHEDULER_HOST: edgex-support-scheduler CLIENTS_VIRTUALDEVICE_HOST: edgex-device-virtual + DATABASECONFIG_NAME: redis.conf + DATABASECONFIG_PATH: /run/redis/conf DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-proxy-setup @@ -250,7 +252,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -270,9 +272,12 @@ services: read_only: true security_opt: - no-new-privileges:true + tmpfs: + - /run volumes: - db-data:/data:z - edgex-init:/edgex-init:ro,z + - redis-config:/run/redis/conf:z - /tmp/edgex/secrets/edgex-security-bootstrap-redis:/tmp/edgex/secrets/edgex-security-bootstrap-redis:ro,z device-rest: container_name: edgex-device-rest @@ -354,7 +359,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -406,7 +411,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -469,7 +474,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -527,7 +532,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -581,7 +586,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -663,7 +668,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -702,7 +707,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -739,7 +744,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -812,7 +817,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -848,6 +853,7 @@ volumes: kuiper-data: {} postgres-config: {} postgres-data: {} + redis-config: {} vault-config: {} vault-file: {} vault-logs: {} diff --git a/releases/nightly-build/compose-files/docker-compose-nexus.yml b/releases/nightly-build/compose-files/docker-compose-nexus.yml index c4dd260..7e03650 100644 --- a/releases/nightly-build/compose-files/docker-compose-nexus.yml +++ b/releases/nightly-build/compose-files/docker-compose-nexus.yml @@ -94,7 +94,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -136,7 +136,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -196,7 +196,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -239,6 +239,8 @@ services: CLIENTS_RULESENGINE_HOST: edgex-kuiper CLIENTS_SCHEDULER_HOST: edgex-support-scheduler CLIENTS_VIRTUALDEVICE_HOST: edgex-device-virtual + DATABASECONFIG_NAME: redis.conf + DATABASECONFIG_PATH: /run/redis/conf DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-proxy-setup @@ -250,7 +252,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -270,9 +272,12 @@ services: read_only: true security_opt: - no-new-privileges:true + tmpfs: + - /run volumes: - db-data:/data:z - edgex-init:/edgex-init:ro,z + - redis-config:/run/redis/conf:z - /tmp/edgex/secrets/edgex-security-bootstrap-redis:/tmp/edgex/secrets/edgex-security-bootstrap-redis:ro,z device-rest: container_name: edgex-device-rest @@ -354,7 +359,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -406,7 +411,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -469,7 +474,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -527,7 +532,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -581,7 +586,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -663,7 +668,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -702,7 +707,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -739,7 +744,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -812,7 +817,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -848,6 +853,7 @@ volumes: kuiper-data: {} postgres-config: {} postgres-data: {} + redis-config: {} vault-config: {} vault-file: {} vault-logs: {} diff --git a/releases/nightly-build/compose-files/taf/docker-compose-taf-nexus-arm64.yml b/releases/nightly-build/compose-files/taf/docker-compose-taf-nexus-arm64.yml index 1f514c5..c634998 100644 --- a/releases/nightly-build/compose-files/taf/docker-compose-taf-nexus-arm64.yml +++ b/releases/nightly-build/compose-files/taf/docker-compose-taf-nexus-arm64.yml @@ -128,7 +128,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -259,7 +259,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -323,7 +323,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -365,7 +365,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -425,7 +425,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -468,6 +468,8 @@ services: CLIENTS_RULESENGINE_HOST: edgex-kuiper CLIENTS_SCHEDULER_HOST: edgex-support-scheduler CLIENTS_VIRTUALDEVICE_HOST: edgex-device-virtual + DATABASECONFIG_NAME: redis.conf + DATABASECONFIG_PATH: /run/redis/conf DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-proxy-setup @@ -479,7 +481,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -499,9 +501,12 @@ services: read_only: true security_opt: - no-new-privileges:true + tmpfs: + - /run volumes: - db-data:/data:z - edgex-init:/edgex-init:ro,z + - redis-config:/run/redis/conf:z - /tmp/edgex/secrets/edgex-security-bootstrap-redis:/tmp/edgex/secrets/edgex-security-bootstrap-redis:ro,z device-modbus: command: --registry --confdir=CONF_DIR_PLACE_HOLDER @@ -618,7 +623,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -670,7 +675,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -733,7 +738,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -815,7 +820,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -869,7 +874,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -986,7 +991,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -1026,7 +1031,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -1063,7 +1068,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -1136,7 +1141,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -1173,6 +1178,7 @@ volumes: kuiper-data: {} postgres-config: {} postgres-data: {} + redis-config: {} vault-config: {} vault-file: {} vault-logs: {} diff --git a/releases/nightly-build/compose-files/taf/docker-compose-taf-nexus.yml b/releases/nightly-build/compose-files/taf/docker-compose-taf-nexus.yml index 2cceb42..b9df220 100644 --- a/releases/nightly-build/compose-files/taf/docker-compose-taf-nexus.yml +++ b/releases/nightly-build/compose-files/taf/docker-compose-taf-nexus.yml @@ -128,7 +128,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -259,7 +259,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -323,7 +323,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -365,7 +365,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -425,7 +425,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -468,6 +468,8 @@ services: CLIENTS_RULESENGINE_HOST: edgex-kuiper CLIENTS_SCHEDULER_HOST: edgex-support-scheduler CLIENTS_VIRTUALDEVICE_HOST: edgex-device-virtual + DATABASECONFIG_NAME: redis.conf + DATABASECONFIG_PATH: /run/redis/conf DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-proxy-setup @@ -479,7 +481,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -499,9 +501,12 @@ services: read_only: true security_opt: - no-new-privileges:true + tmpfs: + - /run volumes: - db-data:/data:z - edgex-init:/edgex-init:ro,z + - redis-config:/run/redis/conf:z - /tmp/edgex/secrets/edgex-security-bootstrap-redis:/tmp/edgex/secrets/edgex-security-bootstrap-redis:ro,z device-modbus: command: --registry --confdir=CONF_DIR_PLACE_HOLDER @@ -618,7 +623,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -670,7 +675,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -733,7 +738,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -815,7 +820,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -869,7 +874,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -986,7 +991,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -1026,7 +1031,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -1063,7 +1068,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -1136,7 +1141,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -1173,6 +1178,7 @@ volumes: kuiper-data: {} postgres-config: {} postgres-data: {} + redis-config: {} vault-config: {} vault-file: {} vault-logs: {} diff --git a/releases/nightly-build/compose-files/taf/docker-compose-taf-perf-nexus-arm64.yml b/releases/nightly-build/compose-files/taf/docker-compose-taf-perf-nexus-arm64.yml index 8b0bebe..ae10834 100644 --- a/releases/nightly-build/compose-files/taf/docker-compose-taf-perf-nexus-arm64.yml +++ b/releases/nightly-build/compose-files/taf/docker-compose-taf-perf-nexus-arm64.yml @@ -128,7 +128,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -170,7 +170,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -230,7 +230,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -273,6 +273,8 @@ services: CLIENTS_RULESENGINE_HOST: edgex-kuiper CLIENTS_SCHEDULER_HOST: edgex-support-scheduler CLIENTS_VIRTUALDEVICE_HOST: edgex-device-virtual + DATABASECONFIG_NAME: redis.conf + DATABASECONFIG_PATH: /run/redis/conf DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-proxy-setup @@ -284,7 +286,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -304,9 +306,12 @@ services: read_only: true security_opt: - no-new-privileges:true + tmpfs: + - /run volumes: - db-data:/data:z - edgex-init:/edgex-init:ro,z + - redis-config:/run/redis/conf:z - /tmp/edgex/secrets/edgex-security-bootstrap-redis:/tmp/edgex/secrets/edgex-security-bootstrap-redis:ro,z device-rest: container_name: edgex-device-rest @@ -388,7 +393,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -440,7 +445,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -503,7 +508,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -573,7 +578,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -627,7 +632,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -709,7 +714,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -748,7 +753,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -785,7 +790,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -858,7 +863,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -894,6 +899,7 @@ volumes: kuiper-data: {} postgres-config: {} postgres-data: {} + redis-config: {} vault-config: {} vault-file: {} vault-logs: {} diff --git a/releases/nightly-build/compose-files/taf/docker-compose-taf-perf-nexus.yml b/releases/nightly-build/compose-files/taf/docker-compose-taf-perf-nexus.yml index 4fd2e56..77bd6cc 100644 --- a/releases/nightly-build/compose-files/taf/docker-compose-taf-perf-nexus.yml +++ b/releases/nightly-build/compose-files/taf/docker-compose-taf-perf-nexus.yml @@ -128,7 +128,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -170,7 +170,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -230,7 +230,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -273,6 +273,8 @@ services: CLIENTS_RULESENGINE_HOST: edgex-kuiper CLIENTS_SCHEDULER_HOST: edgex-support-scheduler CLIENTS_VIRTUALDEVICE_HOST: edgex-device-virtual + DATABASECONFIG_NAME: redis.conf + DATABASECONFIG_PATH: /run/redis/conf DATABASES_PRIMARY_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-proxy-setup @@ -284,7 +286,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -304,9 +306,12 @@ services: read_only: true security_opt: - no-new-privileges:true + tmpfs: + - /run volumes: - db-data:/data:z - edgex-init:/edgex-init:ro,z + - redis-config:/run/redis/conf:z - /tmp/edgex/secrets/edgex-security-bootstrap-redis:/tmp/edgex/secrets/edgex-security-bootstrap-redis:ro,z device-rest: container_name: edgex-device-rest @@ -388,7 +393,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -440,7 +445,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -503,7 +508,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -573,7 +578,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -627,7 +632,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -709,7 +714,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -748,7 +753,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -785,7 +790,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -858,7 +863,7 @@ services: STAGEGATE_BOOTSTRAPPER_STARTPORT: '54321' STAGEGATE_DATABASE_HOST: edgex-redis STAGEGATE_DATABASE_PORT: '6379' - STAGEGATE_DATABASE_READYPORT: '54323' + STAGEGATE_DATABASE_READYPORT: '6379' STAGEGATE_KONGDB_HOST: kong-db STAGEGATE_KONGDB_PORT: '5432' STAGEGATE_KONGDB_READYPORT: '54325' @@ -894,6 +899,7 @@ volumes: kuiper-data: {} postgres-config: {} postgres-data: {} + redis-config: {} vault-config: {} vault-file: {} vault-logs: {}