diff --git a/compose-builder/docker-compose-base.yml b/compose-builder/docker-compose-base.yml index 67ee82cc..81145cfb 100644 --- a/compose-builder/docker-compose-base.yml +++ b/compose-builder/docker-compose-base.yml @@ -166,8 +166,13 @@ services: read_only: true networks: - edgex-network - env_file: - - common.env + environment: + EDGEX_SECURITY_SECRET_STORE: false + ALL_SERVICES_REGISTRY_HOST: edgex-core-consul + ALL_SERVICES_DATABASE_HOST: edgex-redis + ALL_SERVICES_MESSAGEBUS_HOST: edgex-redis + APP_SERVICES_CLIENTS_CORE_METADATA_HOST: edgex-core-metadata + DEVICE_SERVICES_CLIENTS_CORE_METADATA_HOST: edgex-core-metadata depends_on: - consul security_opt: diff --git a/docker-compose-arm64.yml b/docker-compose-arm64.yml index 87064961..d6ffff76 100644 --- a/docker-compose-arm64.yml +++ b/docker-compose-arm64.yml @@ -195,17 +195,15 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + ALL_SERVICES_DATABASE_HOST: edgex-redis + ALL_SERVICES_MESSAGEBUS_HOST: edgex-redis + ALL_SERVICES_REGISTRY_HOST: edgex-core-consul API_GATEWAY_HOST: edgex-kong API_GATEWAY_STATUS_PORT: "8100" - CLIENTS_CORE_COMMAND_HOST: edgex-core-command - CLIENTS_CORE_DATA_HOST: edgex-core-data - CLIENTS_CORE_METADATA_HOST: edgex-core-metadata - CLIENTS_SUPPORT_NOTIFICATIONS_HOST: edgex-support-notifications - CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler - DATABASE_HOST: edgex-redis + APP_SERVICES_CLIENTS_CORE_METADATA_HOST: edgex-core-metadata + DEVICE_SERVICES_CLIENTS_CORE_METADATA_HOST: edgex-core-metadata EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup - REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault STAGEGATE_BOOTSTRAPPER_HOST: edgex-security-bootstrapper STAGEGATE_BOOTSTRAPPER_STARTPORT: "54321" @@ -1046,6 +1044,10 @@ services: source: kuiper-data target: /kuiper/data volume: {} + - type: volume + source: kuiper-etc + target: /kuiper/etc + volume: {} - type: volume source: kuiper-connections target: /kuiper/etc/connections @@ -1054,6 +1056,14 @@ services: source: kuiper-sources target: /kuiper/etc/sources volume: {} + - type: volume + source: kuiper-log + target: /kuiper/log + volume: {} + - type: volume + source: kuiper-plugins + target: /kuiper/plugins + volume: {} scheduler: command: - /support-scheduler @@ -1336,6 +1346,12 @@ volumes: name: edgex_kuiper-connections kuiper-data: name: edgex_kuiper-data + kuiper-etc: + name: edgex_kuiper-etc + kuiper-log: + name: edgex_kuiper-log + kuiper-plugins: + name: edgex_kuiper-plugins kuiper-sources: name: edgex_kuiper-sources nginx-templates: diff --git a/docker-compose-no-secty-arm64.yml b/docker-compose-no-secty-arm64.yml index 15586ef7..9672b5cc 100644 --- a/docker-compose-no-secty-arm64.yml +++ b/docker-compose-no-secty-arm64.yml @@ -102,14 +102,12 @@ services: consul: condition: service_started environment: - CLIENTS_CORE_COMMAND_HOST: edgex-core-command - CLIENTS_CORE_DATA_HOST: edgex-core-data - CLIENTS_CORE_METADATA_HOST: edgex-core-metadata - CLIENTS_SUPPORT_NOTIFICATIONS_HOST: edgex-support-notifications - CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler - DATABASE_HOST: edgex-redis + ALL_SERVICES_DATABASE_HOST: edgex-redis + ALL_SERVICES_MESSAGEBUS_HOST: edgex-redis + ALL_SERVICES_REGISTRY_HOST: edgex-core-consul + APP_SERVICES_CLIENTS_CORE_METADATA_HOST: edgex-core-metadata + DEVICE_SERVICES_CLIENTS_CORE_METADATA_HOST: edgex-core-metadata EDGEX_SECURITY_SECRET_STORE: "false" - REGISTRY_HOST: edgex-core-consul hostname: edgex-core-common-config-bootstrapper image: nexus3.edgexfoundry.org:10004/core-common-config-bootstrapper-arm64:latest networks: @@ -390,6 +388,18 @@ services: source: kuiper-data target: /kuiper/data volume: {} + - type: volume + source: kuiper-etc + target: /kuiper/etc + volume: {} + - type: volume + source: kuiper-log + target: /kuiper/log + volume: {} + - type: volume + source: kuiper-plugins + target: /kuiper/plugins + volume: {} scheduler: container_name: edgex-support-scheduler depends_on: @@ -457,3 +467,9 @@ volumes: name: edgex_db-data kuiper-data: name: edgex_kuiper-data + kuiper-etc: + name: edgex_kuiper-etc + kuiper-log: + name: edgex_kuiper-log + kuiper-plugins: + name: edgex_kuiper-plugins diff --git a/docker-compose-no-secty-with-app-sample-arm64.yml b/docker-compose-no-secty-with-app-sample-arm64.yml index de185c86..2e61c6f5 100644 --- a/docker-compose-no-secty-with-app-sample-arm64.yml +++ b/docker-compose-no-secty-with-app-sample-arm64.yml @@ -136,14 +136,12 @@ services: consul: condition: service_started environment: - CLIENTS_CORE_COMMAND_HOST: edgex-core-command - CLIENTS_CORE_DATA_HOST: edgex-core-data - CLIENTS_CORE_METADATA_HOST: edgex-core-metadata - CLIENTS_SUPPORT_NOTIFICATIONS_HOST: edgex-support-notifications - CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler - DATABASE_HOST: edgex-redis + ALL_SERVICES_DATABASE_HOST: edgex-redis + ALL_SERVICES_MESSAGEBUS_HOST: edgex-redis + ALL_SERVICES_REGISTRY_HOST: edgex-core-consul + APP_SERVICES_CLIENTS_CORE_METADATA_HOST: edgex-core-metadata + DEVICE_SERVICES_CLIENTS_CORE_METADATA_HOST: edgex-core-metadata EDGEX_SECURITY_SECRET_STORE: "false" - REGISTRY_HOST: edgex-core-consul hostname: edgex-core-common-config-bootstrapper image: nexus3.edgexfoundry.org:10004/core-common-config-bootstrapper-arm64:latest networks: @@ -424,6 +422,18 @@ services: source: kuiper-data target: /kuiper/data volume: {} + - type: volume + source: kuiper-etc + target: /kuiper/etc + volume: {} + - type: volume + source: kuiper-log + target: /kuiper/log + volume: {} + - type: volume + source: kuiper-plugins + target: /kuiper/plugins + volume: {} scheduler: container_name: edgex-support-scheduler depends_on: @@ -491,3 +501,9 @@ volumes: name: edgex_db-data kuiper-data: name: edgex_kuiper-data + kuiper-etc: + name: edgex_kuiper-etc + kuiper-log: + name: edgex_kuiper-log + kuiper-plugins: + name: edgex_kuiper-plugins diff --git a/docker-compose-no-secty-with-app-sample.yml b/docker-compose-no-secty-with-app-sample.yml index 95dfbe62..4c887020 100644 --- a/docker-compose-no-secty-with-app-sample.yml +++ b/docker-compose-no-secty-with-app-sample.yml @@ -136,14 +136,12 @@ services: consul: condition: service_started environment: - CLIENTS_CORE_COMMAND_HOST: edgex-core-command - CLIENTS_CORE_DATA_HOST: edgex-core-data - CLIENTS_CORE_METADATA_HOST: edgex-core-metadata - CLIENTS_SUPPORT_NOTIFICATIONS_HOST: edgex-support-notifications - CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler - DATABASE_HOST: edgex-redis + ALL_SERVICES_DATABASE_HOST: edgex-redis + ALL_SERVICES_MESSAGEBUS_HOST: edgex-redis + ALL_SERVICES_REGISTRY_HOST: edgex-core-consul + APP_SERVICES_CLIENTS_CORE_METADATA_HOST: edgex-core-metadata + DEVICE_SERVICES_CLIENTS_CORE_METADATA_HOST: edgex-core-metadata EDGEX_SECURITY_SECRET_STORE: "false" - REGISTRY_HOST: edgex-core-consul hostname: edgex-core-common-config-bootstrapper image: nexus3.edgexfoundry.org:10004/core-common-config-bootstrapper:latest networks: @@ -424,6 +422,18 @@ services: source: kuiper-data target: /kuiper/data volume: {} + - type: volume + source: kuiper-etc + target: /kuiper/etc + volume: {} + - type: volume + source: kuiper-log + target: /kuiper/log + volume: {} + - type: volume + source: kuiper-plugins + target: /kuiper/plugins + volume: {} scheduler: container_name: edgex-support-scheduler depends_on: @@ -491,3 +501,9 @@ volumes: name: edgex_db-data kuiper-data: name: edgex_kuiper-data + kuiper-etc: + name: edgex_kuiper-etc + kuiper-log: + name: edgex_kuiper-log + kuiper-plugins: + name: edgex_kuiper-plugins diff --git a/docker-compose-no-secty.yml b/docker-compose-no-secty.yml index 885b072e..75a7b1a2 100644 --- a/docker-compose-no-secty.yml +++ b/docker-compose-no-secty.yml @@ -102,14 +102,12 @@ services: consul: condition: service_started environment: - CLIENTS_CORE_COMMAND_HOST: edgex-core-command - CLIENTS_CORE_DATA_HOST: edgex-core-data - CLIENTS_CORE_METADATA_HOST: edgex-core-metadata - CLIENTS_SUPPORT_NOTIFICATIONS_HOST: edgex-support-notifications - CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler - DATABASE_HOST: edgex-redis + ALL_SERVICES_DATABASE_HOST: edgex-redis + ALL_SERVICES_MESSAGEBUS_HOST: edgex-redis + ALL_SERVICES_REGISTRY_HOST: edgex-core-consul + APP_SERVICES_CLIENTS_CORE_METADATA_HOST: edgex-core-metadata + DEVICE_SERVICES_CLIENTS_CORE_METADATA_HOST: edgex-core-metadata EDGEX_SECURITY_SECRET_STORE: "false" - REGISTRY_HOST: edgex-core-consul hostname: edgex-core-common-config-bootstrapper image: nexus3.edgexfoundry.org:10004/core-common-config-bootstrapper:latest networks: @@ -390,6 +388,18 @@ services: source: kuiper-data target: /kuiper/data volume: {} + - type: volume + source: kuiper-etc + target: /kuiper/etc + volume: {} + - type: volume + source: kuiper-log + target: /kuiper/log + volume: {} + - type: volume + source: kuiper-plugins + target: /kuiper/plugins + volume: {} scheduler: container_name: edgex-support-scheduler depends_on: @@ -457,3 +467,9 @@ volumes: name: edgex_db-data kuiper-data: name: edgex_kuiper-data + kuiper-etc: + name: edgex_kuiper-etc + kuiper-log: + name: edgex_kuiper-log + kuiper-plugins: + name: edgex_kuiper-plugins diff --git a/docker-compose-with-app-sample-arm64.yml b/docker-compose-with-app-sample-arm64.yml index 2470678c..71a77f48 100644 --- a/docker-compose-with-app-sample-arm64.yml +++ b/docker-compose-with-app-sample-arm64.yml @@ -269,17 +269,15 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + ALL_SERVICES_DATABASE_HOST: edgex-redis + ALL_SERVICES_MESSAGEBUS_HOST: edgex-redis + ALL_SERVICES_REGISTRY_HOST: edgex-core-consul API_GATEWAY_HOST: edgex-kong API_GATEWAY_STATUS_PORT: "8100" - CLIENTS_CORE_COMMAND_HOST: edgex-core-command - CLIENTS_CORE_DATA_HOST: edgex-core-data - CLIENTS_CORE_METADATA_HOST: edgex-core-metadata - CLIENTS_SUPPORT_NOTIFICATIONS_HOST: edgex-support-notifications - CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler - DATABASE_HOST: edgex-redis + APP_SERVICES_CLIENTS_CORE_METADATA_HOST: edgex-core-metadata + DEVICE_SERVICES_CLIENTS_CORE_METADATA_HOST: edgex-core-metadata EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup - REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault STAGEGATE_BOOTSTRAPPER_HOST: edgex-security-bootstrapper STAGEGATE_BOOTSTRAPPER_STARTPORT: "54321" @@ -1120,6 +1118,10 @@ services: source: kuiper-data target: /kuiper/data volume: {} + - type: volume + source: kuiper-etc + target: /kuiper/etc + volume: {} - type: volume source: kuiper-connections target: /kuiper/etc/connections @@ -1128,6 +1130,14 @@ services: source: kuiper-sources target: /kuiper/etc/sources volume: {} + - type: volume + source: kuiper-log + target: /kuiper/log + volume: {} + - type: volume + source: kuiper-plugins + target: /kuiper/plugins + volume: {} scheduler: command: - /support-scheduler @@ -1410,6 +1420,12 @@ volumes: name: edgex_kuiper-connections kuiper-data: name: edgex_kuiper-data + kuiper-etc: + name: edgex_kuiper-etc + kuiper-log: + name: edgex_kuiper-log + kuiper-plugins: + name: edgex_kuiper-plugins kuiper-sources: name: edgex_kuiper-sources nginx-templates: diff --git a/docker-compose-with-app-sample.yml b/docker-compose-with-app-sample.yml index 4eb689f8..3f031f73 100644 --- a/docker-compose-with-app-sample.yml +++ b/docker-compose-with-app-sample.yml @@ -269,17 +269,15 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + ALL_SERVICES_DATABASE_HOST: edgex-redis + ALL_SERVICES_MESSAGEBUS_HOST: edgex-redis + ALL_SERVICES_REGISTRY_HOST: edgex-core-consul API_GATEWAY_HOST: edgex-kong API_GATEWAY_STATUS_PORT: "8100" - CLIENTS_CORE_COMMAND_HOST: edgex-core-command - CLIENTS_CORE_DATA_HOST: edgex-core-data - CLIENTS_CORE_METADATA_HOST: edgex-core-metadata - CLIENTS_SUPPORT_NOTIFICATIONS_HOST: edgex-support-notifications - CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler - DATABASE_HOST: edgex-redis + APP_SERVICES_CLIENTS_CORE_METADATA_HOST: edgex-core-metadata + DEVICE_SERVICES_CLIENTS_CORE_METADATA_HOST: edgex-core-metadata EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup - REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault STAGEGATE_BOOTSTRAPPER_HOST: edgex-security-bootstrapper STAGEGATE_BOOTSTRAPPER_STARTPORT: "54321" @@ -1120,6 +1118,10 @@ services: source: kuiper-data target: /kuiper/data volume: {} + - type: volume + source: kuiper-etc + target: /kuiper/etc + volume: {} - type: volume source: kuiper-connections target: /kuiper/etc/connections @@ -1128,6 +1130,14 @@ services: source: kuiper-sources target: /kuiper/etc/sources volume: {} + - type: volume + source: kuiper-log + target: /kuiper/log + volume: {} + - type: volume + source: kuiper-plugins + target: /kuiper/plugins + volume: {} scheduler: command: - /support-scheduler @@ -1410,6 +1420,12 @@ volumes: name: edgex_kuiper-connections kuiper-data: name: edgex_kuiper-data + kuiper-etc: + name: edgex_kuiper-etc + kuiper-log: + name: edgex_kuiper-log + kuiper-plugins: + name: edgex_kuiper-plugins kuiper-sources: name: edgex_kuiper-sources nginx-templates: diff --git a/docker-compose.yml b/docker-compose.yml index d795c3a6..426a323c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -195,17 +195,15 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + ALL_SERVICES_DATABASE_HOST: edgex-redis + ALL_SERVICES_MESSAGEBUS_HOST: edgex-redis + ALL_SERVICES_REGISTRY_HOST: edgex-core-consul API_GATEWAY_HOST: edgex-kong API_GATEWAY_STATUS_PORT: "8100" - CLIENTS_CORE_COMMAND_HOST: edgex-core-command - CLIENTS_CORE_DATA_HOST: edgex-core-data - CLIENTS_CORE_METADATA_HOST: edgex-core-metadata - CLIENTS_SUPPORT_NOTIFICATIONS_HOST: edgex-support-notifications - CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler - DATABASE_HOST: edgex-redis + APP_SERVICES_CLIENTS_CORE_METADATA_HOST: edgex-core-metadata + DEVICE_SERVICES_CLIENTS_CORE_METADATA_HOST: edgex-core-metadata EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup - REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault STAGEGATE_BOOTSTRAPPER_HOST: edgex-security-bootstrapper STAGEGATE_BOOTSTRAPPER_STARTPORT: "54321" @@ -1046,6 +1044,10 @@ services: source: kuiper-data target: /kuiper/data volume: {} + - type: volume + source: kuiper-etc + target: /kuiper/etc + volume: {} - type: volume source: kuiper-connections target: /kuiper/etc/connections @@ -1054,6 +1056,14 @@ services: source: kuiper-sources target: /kuiper/etc/sources volume: {} + - type: volume + source: kuiper-log + target: /kuiper/log + volume: {} + - type: volume + source: kuiper-plugins + target: /kuiper/plugins + volume: {} scheduler: command: - /support-scheduler @@ -1336,6 +1346,12 @@ volumes: name: edgex_kuiper-connections kuiper-data: name: edgex_kuiper-data + kuiper-etc: + name: edgex_kuiper-etc + kuiper-log: + name: edgex_kuiper-log + kuiper-plugins: + name: edgex_kuiper-plugins kuiper-sources: name: edgex_kuiper-sources nginx-templates: diff --git a/taf/docker-compose-taf-arm64.yml b/taf/docker-compose-taf-arm64.yml index 5ef8f0f0..fcb14880 100644 --- a/taf/docker-compose-taf-arm64.yml +++ b/taf/docker-compose-taf-arm64.yml @@ -572,17 +572,15 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + ALL_SERVICES_DATABASE_HOST: edgex-redis + ALL_SERVICES_MESSAGEBUS_HOST: edgex-redis + ALL_SERVICES_REGISTRY_HOST: edgex-core-consul API_GATEWAY_HOST: edgex-kong API_GATEWAY_STATUS_PORT: "8100" - CLIENTS_CORE_COMMAND_HOST: edgex-core-command - CLIENTS_CORE_DATA_HOST: edgex-core-data - CLIENTS_CORE_METADATA_HOST: edgex-core-metadata - CLIENTS_SUPPORT_NOTIFICATIONS_HOST: edgex-support-notifications - CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler - DATABASE_HOST: edgex-redis + APP_SERVICES_CLIENTS_CORE_METADATA_HOST: edgex-core-metadata + DEVICE_SERVICES_CLIENTS_CORE_METADATA_HOST: edgex-core-metadata EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup - REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault STAGEGATE_BOOTSTRAPPER_HOST: edgex-security-bootstrapper STAGEGATE_BOOTSTRAPPER_STARTPORT: "54321" @@ -1648,6 +1646,10 @@ services: source: kuiper-data target: /kuiper/data volume: {} + - type: volume + source: kuiper-etc + target: /kuiper/etc + volume: {} - type: volume source: kuiper-connections target: /kuiper/etc/connections @@ -1656,6 +1658,14 @@ services: source: kuiper-sources target: /kuiper/etc/sources volume: {} + - type: volume + source: kuiper-log + target: /kuiper/log + volume: {} + - type: volume + source: kuiper-plugins + target: /kuiper/plugins + volume: {} scalability-test-mqtt-export: command: - /app-service-configurable @@ -2301,6 +2311,12 @@ volumes: name: edgex_kuiper-connections kuiper-data: name: edgex_kuiper-data + kuiper-etc: + name: edgex_kuiper-etc + kuiper-log: + name: edgex_kuiper-log + kuiper-plugins: + name: edgex_kuiper-plugins kuiper-sources: name: edgex_kuiper-sources nginx-templates: diff --git a/taf/docker-compose-taf-mqtt-bus-arm64.yml b/taf/docker-compose-taf-mqtt-bus-arm64.yml index a95e39c1..cbc3009b 100644 --- a/taf/docker-compose-taf-mqtt-bus-arm64.yml +++ b/taf/docker-compose-taf-mqtt-bus-arm64.yml @@ -611,17 +611,15 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + ALL_SERVICES_DATABASE_HOST: edgex-redis + ALL_SERVICES_MESSAGEBUS_HOST: edgex-redis + ALL_SERVICES_REGISTRY_HOST: edgex-core-consul API_GATEWAY_HOST: edgex-kong API_GATEWAY_STATUS_PORT: "8100" - CLIENTS_CORE_COMMAND_HOST: edgex-core-command - CLIENTS_CORE_DATA_HOST: edgex-core-data - CLIENTS_CORE_METADATA_HOST: edgex-core-metadata - CLIENTS_SUPPORT_NOTIFICATIONS_HOST: edgex-support-notifications - CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler - DATABASE_HOST: edgex-redis + APP_SERVICES_CLIENTS_CORE_METADATA_HOST: edgex-core-metadata + DEVICE_SERVICES_CLIENTS_CORE_METADATA_HOST: edgex-core-metadata EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup - REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault STAGEGATE_BOOTSTRAPPER_HOST: edgex-security-bootstrapper STAGEGATE_BOOTSTRAPPER_STARTPORT: "54321" @@ -1798,6 +1796,10 @@ services: source: kuiper-data target: /kuiper/data volume: {} + - type: volume + source: kuiper-etc + target: /kuiper/etc + volume: {} - type: volume source: kuiper-connections target: /kuiper/etc/connections @@ -1806,6 +1808,14 @@ services: source: kuiper-sources target: /kuiper/etc/sources volume: {} + - type: volume + source: kuiper-log + target: /kuiper/log + volume: {} + - type: volume + source: kuiper-plugins + target: /kuiper/plugins + volume: {} scalability-test-mqtt-export: command: - /app-service-configurable @@ -2468,6 +2478,12 @@ volumes: name: edgex_kuiper-connections kuiper-data: name: edgex_kuiper-data + kuiper-etc: + name: edgex_kuiper-etc + kuiper-log: + name: edgex_kuiper-log + kuiper-plugins: + name: edgex_kuiper-plugins kuiper-sources: name: edgex_kuiper-sources mqtt: diff --git a/taf/docker-compose-taf-mqtt-bus.yml b/taf/docker-compose-taf-mqtt-bus.yml index 5b353308..8f6baa11 100644 --- a/taf/docker-compose-taf-mqtt-bus.yml +++ b/taf/docker-compose-taf-mqtt-bus.yml @@ -611,17 +611,15 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + ALL_SERVICES_DATABASE_HOST: edgex-redis + ALL_SERVICES_MESSAGEBUS_HOST: edgex-redis + ALL_SERVICES_REGISTRY_HOST: edgex-core-consul API_GATEWAY_HOST: edgex-kong API_GATEWAY_STATUS_PORT: "8100" - CLIENTS_CORE_COMMAND_HOST: edgex-core-command - CLIENTS_CORE_DATA_HOST: edgex-core-data - CLIENTS_CORE_METADATA_HOST: edgex-core-metadata - CLIENTS_SUPPORT_NOTIFICATIONS_HOST: edgex-support-notifications - CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler - DATABASE_HOST: edgex-redis + APP_SERVICES_CLIENTS_CORE_METADATA_HOST: edgex-core-metadata + DEVICE_SERVICES_CLIENTS_CORE_METADATA_HOST: edgex-core-metadata EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup - REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault STAGEGATE_BOOTSTRAPPER_HOST: edgex-security-bootstrapper STAGEGATE_BOOTSTRAPPER_STARTPORT: "54321" @@ -1798,6 +1796,10 @@ services: source: kuiper-data target: /kuiper/data volume: {} + - type: volume + source: kuiper-etc + target: /kuiper/etc + volume: {} - type: volume source: kuiper-connections target: /kuiper/etc/connections @@ -1806,6 +1808,14 @@ services: source: kuiper-sources target: /kuiper/etc/sources volume: {} + - type: volume + source: kuiper-log + target: /kuiper/log + volume: {} + - type: volume + source: kuiper-plugins + target: /kuiper/plugins + volume: {} scalability-test-mqtt-export: command: - /app-service-configurable @@ -2468,6 +2478,12 @@ volumes: name: edgex_kuiper-connections kuiper-data: name: edgex_kuiper-data + kuiper-etc: + name: edgex_kuiper-etc + kuiper-log: + name: edgex_kuiper-log + kuiper-plugins: + name: edgex_kuiper-plugins kuiper-sources: name: edgex_kuiper-sources mqtt: diff --git a/taf/docker-compose-taf-no-secty-arm64.yml b/taf/docker-compose-taf-no-secty-arm64.yml index 9b046472..b4ddd15c 100644 --- a/taf/docker-compose-taf-no-secty-arm64.yml +++ b/taf/docker-compose-taf-no-secty-arm64.yml @@ -279,14 +279,12 @@ services: consul: condition: service_started environment: - CLIENTS_CORE_COMMAND_HOST: edgex-core-command - CLIENTS_CORE_DATA_HOST: edgex-core-data - CLIENTS_CORE_METADATA_HOST: edgex-core-metadata - CLIENTS_SUPPORT_NOTIFICATIONS_HOST: edgex-support-notifications - CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler - DATABASE_HOST: edgex-redis + ALL_SERVICES_DATABASE_HOST: edgex-redis + ALL_SERVICES_MESSAGEBUS_HOST: edgex-redis + ALL_SERVICES_REGISTRY_HOST: edgex-core-consul + APP_SERVICES_CLIENTS_CORE_METADATA_HOST: edgex-core-metadata + DEVICE_SERVICES_CLIENTS_CORE_METADATA_HOST: edgex-core-metadata EDGEX_SECURITY_SECRET_STORE: "false" - REGISTRY_HOST: edgex-core-consul hostname: edgex-core-common-config-bootstrapper image: nexus3.edgexfoundry.org:10004/core-common-config-bootstrapper-arm64:latest networks: @@ -720,6 +718,18 @@ services: source: kuiper-data target: /kuiper/data volume: {} + - type: volume + source: kuiper-etc + target: /kuiper/etc + volume: {} + - type: volume + source: kuiper-log + target: /kuiper/log + volume: {} + - type: volume + source: kuiper-plugins + target: /kuiper/plugins + volume: {} scalability-test-mqtt-export: container_name: edgex-scalability-test-mqtt-export depends_on: @@ -825,3 +835,9 @@ volumes: name: edgex_db-data kuiper-data: name: edgex_kuiper-data + kuiper-etc: + name: edgex_kuiper-etc + kuiper-log: + name: edgex_kuiper-log + kuiper-plugins: + name: edgex_kuiper-plugins diff --git a/taf/docker-compose-taf-no-secty-mqtt-bus-arm64.yml b/taf/docker-compose-taf-no-secty-mqtt-bus-arm64.yml index 82546e7f..25f6f219 100644 --- a/taf/docker-compose-taf-no-secty-mqtt-bus-arm64.yml +++ b/taf/docker-compose-taf-no-secty-mqtt-bus-arm64.yml @@ -311,14 +311,12 @@ services: consul: condition: service_started environment: - CLIENTS_CORE_COMMAND_HOST: edgex-core-command - CLIENTS_CORE_DATA_HOST: edgex-core-data - CLIENTS_CORE_METADATA_HOST: edgex-core-metadata - CLIENTS_SUPPORT_NOTIFICATIONS_HOST: edgex-support-notifications - CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler - DATABASE_HOST: edgex-redis + ALL_SERVICES_DATABASE_HOST: edgex-redis + ALL_SERVICES_MESSAGEBUS_HOST: edgex-redis + ALL_SERVICES_REGISTRY_HOST: edgex-core-consul + APP_SERVICES_CLIENTS_CORE_METADATA_HOST: edgex-core-metadata + DEVICE_SERVICES_CLIENTS_CORE_METADATA_HOST: edgex-core-metadata EDGEX_SECURITY_SECRET_STORE: "false" - REGISTRY_HOST: edgex-core-consul hostname: edgex-core-common-config-bootstrapper image: nexus3.edgexfoundry.org:10004/core-common-config-bootstrapper-arm64:latest networks: @@ -808,6 +806,18 @@ services: source: kuiper-data target: /kuiper/data volume: {} + - type: volume + source: kuiper-etc + target: /kuiper/etc + volume: {} + - type: volume + source: kuiper-log + target: /kuiper/log + volume: {} + - type: volume + source: kuiper-plugins + target: /kuiper/plugins + volume: {} scalability-test-mqtt-export: container_name: edgex-scalability-test-mqtt-export depends_on: @@ -926,3 +936,9 @@ volumes: name: edgex_db-data kuiper-data: name: edgex_kuiper-data + kuiper-etc: + name: edgex_kuiper-etc + kuiper-log: + name: edgex_kuiper-log + kuiper-plugins: + name: edgex_kuiper-plugins diff --git a/taf/docker-compose-taf-no-secty-mqtt-bus.yml b/taf/docker-compose-taf-no-secty-mqtt-bus.yml index 8309af93..2c57294e 100644 --- a/taf/docker-compose-taf-no-secty-mqtt-bus.yml +++ b/taf/docker-compose-taf-no-secty-mqtt-bus.yml @@ -311,14 +311,12 @@ services: consul: condition: service_started environment: - CLIENTS_CORE_COMMAND_HOST: edgex-core-command - CLIENTS_CORE_DATA_HOST: edgex-core-data - CLIENTS_CORE_METADATA_HOST: edgex-core-metadata - CLIENTS_SUPPORT_NOTIFICATIONS_HOST: edgex-support-notifications - CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler - DATABASE_HOST: edgex-redis + ALL_SERVICES_DATABASE_HOST: edgex-redis + ALL_SERVICES_MESSAGEBUS_HOST: edgex-redis + ALL_SERVICES_REGISTRY_HOST: edgex-core-consul + APP_SERVICES_CLIENTS_CORE_METADATA_HOST: edgex-core-metadata + DEVICE_SERVICES_CLIENTS_CORE_METADATA_HOST: edgex-core-metadata EDGEX_SECURITY_SECRET_STORE: "false" - REGISTRY_HOST: edgex-core-consul hostname: edgex-core-common-config-bootstrapper image: nexus3.edgexfoundry.org:10004/core-common-config-bootstrapper:latest networks: @@ -808,6 +806,18 @@ services: source: kuiper-data target: /kuiper/data volume: {} + - type: volume + source: kuiper-etc + target: /kuiper/etc + volume: {} + - type: volume + source: kuiper-log + target: /kuiper/log + volume: {} + - type: volume + source: kuiper-plugins + target: /kuiper/plugins + volume: {} scalability-test-mqtt-export: container_name: edgex-scalability-test-mqtt-export depends_on: @@ -926,3 +936,9 @@ volumes: name: edgex_db-data kuiper-data: name: edgex_kuiper-data + kuiper-etc: + name: edgex_kuiper-etc + kuiper-log: + name: edgex_kuiper-log + kuiper-plugins: + name: edgex_kuiper-plugins diff --git a/taf/docker-compose-taf-no-secty.yml b/taf/docker-compose-taf-no-secty.yml index 2bafd6ca..18a7b49e 100644 --- a/taf/docker-compose-taf-no-secty.yml +++ b/taf/docker-compose-taf-no-secty.yml @@ -279,14 +279,12 @@ services: consul: condition: service_started environment: - CLIENTS_CORE_COMMAND_HOST: edgex-core-command - CLIENTS_CORE_DATA_HOST: edgex-core-data - CLIENTS_CORE_METADATA_HOST: edgex-core-metadata - CLIENTS_SUPPORT_NOTIFICATIONS_HOST: edgex-support-notifications - CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler - DATABASE_HOST: edgex-redis + ALL_SERVICES_DATABASE_HOST: edgex-redis + ALL_SERVICES_MESSAGEBUS_HOST: edgex-redis + ALL_SERVICES_REGISTRY_HOST: edgex-core-consul + APP_SERVICES_CLIENTS_CORE_METADATA_HOST: edgex-core-metadata + DEVICE_SERVICES_CLIENTS_CORE_METADATA_HOST: edgex-core-metadata EDGEX_SECURITY_SECRET_STORE: "false" - REGISTRY_HOST: edgex-core-consul hostname: edgex-core-common-config-bootstrapper image: nexus3.edgexfoundry.org:10004/core-common-config-bootstrapper:latest networks: @@ -720,6 +718,18 @@ services: source: kuiper-data target: /kuiper/data volume: {} + - type: volume + source: kuiper-etc + target: /kuiper/etc + volume: {} + - type: volume + source: kuiper-log + target: /kuiper/log + volume: {} + - type: volume + source: kuiper-plugins + target: /kuiper/plugins + volume: {} scalability-test-mqtt-export: container_name: edgex-scalability-test-mqtt-export depends_on: @@ -825,3 +835,9 @@ volumes: name: edgex_db-data kuiper-data: name: edgex_kuiper-data + kuiper-etc: + name: edgex_kuiper-etc + kuiper-log: + name: edgex_kuiper-log + kuiper-plugins: + name: edgex_kuiper-plugins diff --git a/taf/docker-compose-taf-perf-arm64.yml b/taf/docker-compose-taf-perf-arm64.yml index 7d85b48e..58a9ac4a 100644 --- a/taf/docker-compose-taf-perf-arm64.yml +++ b/taf/docker-compose-taf-perf-arm64.yml @@ -272,17 +272,15 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + ALL_SERVICES_DATABASE_HOST: edgex-redis + ALL_SERVICES_MESSAGEBUS_HOST: edgex-redis + ALL_SERVICES_REGISTRY_HOST: edgex-core-consul API_GATEWAY_HOST: edgex-kong API_GATEWAY_STATUS_PORT: "8100" - CLIENTS_CORE_COMMAND_HOST: edgex-core-command - CLIENTS_CORE_DATA_HOST: edgex-core-data - CLIENTS_CORE_METADATA_HOST: edgex-core-metadata - CLIENTS_SUPPORT_NOTIFICATIONS_HOST: edgex-support-notifications - CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler - DATABASE_HOST: edgex-redis + APP_SERVICES_CLIENTS_CORE_METADATA_HOST: edgex-core-metadata + DEVICE_SERVICES_CLIENTS_CORE_METADATA_HOST: edgex-core-metadata EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup - REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault STAGEGATE_BOOTSTRAPPER_HOST: edgex-security-bootstrapper STAGEGATE_BOOTSTRAPPER_STARTPORT: "54321" @@ -1165,6 +1163,10 @@ services: source: kuiper-data target: /kuiper/data volume: {} + - type: volume + source: kuiper-etc + target: /kuiper/etc + volume: {} - type: volume source: kuiper-connections target: /kuiper/etc/connections @@ -1173,6 +1175,14 @@ services: source: kuiper-sources target: /kuiper/etc/sources volume: {} + - type: volume + source: kuiper-log + target: /kuiper/log + volume: {} + - type: volume + source: kuiper-plugins + target: /kuiper/plugins + volume: {} scheduler: command: - /support-scheduler @@ -1740,6 +1750,12 @@ volumes: name: edgex_kuiper-connections kuiper-data: name: edgex_kuiper-data + kuiper-etc: + name: edgex_kuiper-etc + kuiper-log: + name: edgex_kuiper-log + kuiper-plugins: + name: edgex_kuiper-plugins kuiper-sources: name: edgex_kuiper-sources nginx-templates: diff --git a/taf/docker-compose-taf-perf-no-secty-arm64.yml b/taf/docker-compose-taf-perf-no-secty-arm64.yml index 748c001a..dfaa9b25 100644 --- a/taf/docker-compose-taf-perf-no-secty-arm64.yml +++ b/taf/docker-compose-taf-perf-no-secty-arm64.yml @@ -139,14 +139,12 @@ services: consul: condition: service_started environment: - CLIENTS_CORE_COMMAND_HOST: edgex-core-command - CLIENTS_CORE_DATA_HOST: edgex-core-data - CLIENTS_CORE_METADATA_HOST: edgex-core-metadata - CLIENTS_SUPPORT_NOTIFICATIONS_HOST: edgex-support-notifications - CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler - DATABASE_HOST: edgex-redis + ALL_SERVICES_DATABASE_HOST: edgex-redis + ALL_SERVICES_MESSAGEBUS_HOST: edgex-redis + ALL_SERVICES_REGISTRY_HOST: edgex-core-consul + APP_SERVICES_CLIENTS_CORE_METADATA_HOST: edgex-core-metadata + DEVICE_SERVICES_CLIENTS_CORE_METADATA_HOST: edgex-core-metadata EDGEX_SECURITY_SECRET_STORE: "false" - REGISTRY_HOST: edgex-core-consul hostname: edgex-core-common-config-bootstrapper image: nexus3.edgexfoundry.org:10004/core-common-config-bootstrapper-arm64:latest networks: @@ -469,6 +467,18 @@ services: source: kuiper-data target: /kuiper/data volume: {} + - type: volume + source: kuiper-etc + target: /kuiper/etc + volume: {} + - type: volume + source: kuiper-log + target: /kuiper/log + volume: {} + - type: volume + source: kuiper-plugins + target: /kuiper/plugins + volume: {} scheduler: container_name: edgex-support-scheduler depends_on: @@ -536,3 +546,9 @@ volumes: name: edgex_db-data kuiper-data: name: edgex_kuiper-data + kuiper-etc: + name: edgex_kuiper-etc + kuiper-log: + name: edgex_kuiper-log + kuiper-plugins: + name: edgex_kuiper-plugins diff --git a/taf/docker-compose-taf-perf-no-secty.yml b/taf/docker-compose-taf-perf-no-secty.yml index 35131a0e..b0416597 100644 --- a/taf/docker-compose-taf-perf-no-secty.yml +++ b/taf/docker-compose-taf-perf-no-secty.yml @@ -139,14 +139,12 @@ services: consul: condition: service_started environment: - CLIENTS_CORE_COMMAND_HOST: edgex-core-command - CLIENTS_CORE_DATA_HOST: edgex-core-data - CLIENTS_CORE_METADATA_HOST: edgex-core-metadata - CLIENTS_SUPPORT_NOTIFICATIONS_HOST: edgex-support-notifications - CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler - DATABASE_HOST: edgex-redis + ALL_SERVICES_DATABASE_HOST: edgex-redis + ALL_SERVICES_MESSAGEBUS_HOST: edgex-redis + ALL_SERVICES_REGISTRY_HOST: edgex-core-consul + APP_SERVICES_CLIENTS_CORE_METADATA_HOST: edgex-core-metadata + DEVICE_SERVICES_CLIENTS_CORE_METADATA_HOST: edgex-core-metadata EDGEX_SECURITY_SECRET_STORE: "false" - REGISTRY_HOST: edgex-core-consul hostname: edgex-core-common-config-bootstrapper image: nexus3.edgexfoundry.org:10004/core-common-config-bootstrapper:latest networks: @@ -469,6 +467,18 @@ services: source: kuiper-data target: /kuiper/data volume: {} + - type: volume + source: kuiper-etc + target: /kuiper/etc + volume: {} + - type: volume + source: kuiper-log + target: /kuiper/log + volume: {} + - type: volume + source: kuiper-plugins + target: /kuiper/plugins + volume: {} scheduler: container_name: edgex-support-scheduler depends_on: @@ -536,3 +546,9 @@ volumes: name: edgex_db-data kuiper-data: name: edgex_kuiper-data + kuiper-etc: + name: edgex_kuiper-etc + kuiper-log: + name: edgex_kuiper-log + kuiper-plugins: + name: edgex_kuiper-plugins diff --git a/taf/docker-compose-taf-perf.yml b/taf/docker-compose-taf-perf.yml index 3b2e46b3..2367b6ae 100644 --- a/taf/docker-compose-taf-perf.yml +++ b/taf/docker-compose-taf-perf.yml @@ -272,17 +272,15 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + ALL_SERVICES_DATABASE_HOST: edgex-redis + ALL_SERVICES_MESSAGEBUS_HOST: edgex-redis + ALL_SERVICES_REGISTRY_HOST: edgex-core-consul API_GATEWAY_HOST: edgex-kong API_GATEWAY_STATUS_PORT: "8100" - CLIENTS_CORE_COMMAND_HOST: edgex-core-command - CLIENTS_CORE_DATA_HOST: edgex-core-data - CLIENTS_CORE_METADATA_HOST: edgex-core-metadata - CLIENTS_SUPPORT_NOTIFICATIONS_HOST: edgex-support-notifications - CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler - DATABASE_HOST: edgex-redis + APP_SERVICES_CLIENTS_CORE_METADATA_HOST: edgex-core-metadata + DEVICE_SERVICES_CLIENTS_CORE_METADATA_HOST: edgex-core-metadata EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup - REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault STAGEGATE_BOOTSTRAPPER_HOST: edgex-security-bootstrapper STAGEGATE_BOOTSTRAPPER_STARTPORT: "54321" @@ -1165,6 +1163,10 @@ services: source: kuiper-data target: /kuiper/data volume: {} + - type: volume + source: kuiper-etc + target: /kuiper/etc + volume: {} - type: volume source: kuiper-connections target: /kuiper/etc/connections @@ -1173,6 +1175,14 @@ services: source: kuiper-sources target: /kuiper/etc/sources volume: {} + - type: volume + source: kuiper-log + target: /kuiper/log + volume: {} + - type: volume + source: kuiper-plugins + target: /kuiper/plugins + volume: {} scheduler: command: - /support-scheduler @@ -1740,6 +1750,12 @@ volumes: name: edgex_kuiper-connections kuiper-data: name: edgex_kuiper-data + kuiper-etc: + name: edgex_kuiper-etc + kuiper-log: + name: edgex_kuiper-log + kuiper-plugins: + name: edgex_kuiper-plugins kuiper-sources: name: edgex_kuiper-sources nginx-templates: diff --git a/taf/docker-compose-taf.yml b/taf/docker-compose-taf.yml index 65bca4aa..3e4e1752 100644 --- a/taf/docker-compose-taf.yml +++ b/taf/docker-compose-taf.yml @@ -572,17 +572,15 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + ALL_SERVICES_DATABASE_HOST: edgex-redis + ALL_SERVICES_MESSAGEBUS_HOST: edgex-redis + ALL_SERVICES_REGISTRY_HOST: edgex-core-consul API_GATEWAY_HOST: edgex-kong API_GATEWAY_STATUS_PORT: "8100" - CLIENTS_CORE_COMMAND_HOST: edgex-core-command - CLIENTS_CORE_DATA_HOST: edgex-core-data - CLIENTS_CORE_METADATA_HOST: edgex-core-metadata - CLIENTS_SUPPORT_NOTIFICATIONS_HOST: edgex-support-notifications - CLIENTS_SUPPORT_SCHEDULER_HOST: edgex-support-scheduler - DATABASE_HOST: edgex-redis + APP_SERVICES_CLIENTS_CORE_METADATA_HOST: edgex-core-metadata + DEVICE_SERVICES_CLIENTS_CORE_METADATA_HOST: edgex-core-metadata EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup - REGISTRY_HOST: edgex-core-consul SECRETSTORE_HOST: edgex-vault STAGEGATE_BOOTSTRAPPER_HOST: edgex-security-bootstrapper STAGEGATE_BOOTSTRAPPER_STARTPORT: "54321" @@ -1648,6 +1646,10 @@ services: source: kuiper-data target: /kuiper/data volume: {} + - type: volume + source: kuiper-etc + target: /kuiper/etc + volume: {} - type: volume source: kuiper-connections target: /kuiper/etc/connections @@ -1656,6 +1658,14 @@ services: source: kuiper-sources target: /kuiper/etc/sources volume: {} + - type: volume + source: kuiper-log + target: /kuiper/log + volume: {} + - type: volume + source: kuiper-plugins + target: /kuiper/plugins + volume: {} scalability-test-mqtt-export: command: - /app-service-configurable @@ -2301,6 +2311,12 @@ volumes: name: edgex_kuiper-connections kuiper-data: name: edgex_kuiper-data + kuiper-etc: + name: edgex_kuiper-etc + kuiper-log: + name: edgex_kuiper-log + kuiper-plugins: + name: edgex_kuiper-plugins kuiper-sources: name: edgex_kuiper-sources nginx-templates: