From a08dc496038a69392ce2c96058dce0f35ce6d16e Mon Sep 17 00:00:00 2001 From: Cloud Tsai Date: Mon, 26 Aug 2024 19:56:19 +0800 Subject: [PATCH] fix: Added DATABASE_HOST env variable Added DATABASE_HOST env var in response to private config changes. Remove the obsoleted `version` in the compose file as well. Close https://github.com/edgexfoundry/edgex-compose/issues/455 Signed-off-by: Cloud Tsai --- compose-builder/add-app-record-replay.yml | 2 -- compose-builder/add-app-rfid-llrp-inventory.yml | 2 -- compose-builder/add-asc-external-mqtt-trigger.yml | 2 -- compose-builder/add-asc-http-export.yml | 2 -- compose-builder/add-asc-metrics-influxdb.yml | 2 -- compose-builder/add-asc-mqtt-export.yml | 2 -- compose-builder/add-asc-sample.yml | 2 -- compose-builder/add-consul.yml | 2 -- compose-builder/add-delayed-start-services.yml | 2 -- compose-builder/add-device-bacnet-ip.yml | 2 -- compose-builder/add-device-bacnet-mstp.yml | 2 -- compose-builder/add-device-coap.yml | 2 -- compose-builder/add-device-gpio.yml | 2 -- compose-builder/add-device-modbus.yml | 2 -- compose-builder/add-device-mqtt.yml | 2 -- compose-builder/add-device-onvif-camera.yml | 2 -- compose-builder/add-device-rest.yml | 2 -- compose-builder/add-device-rfid-llrp.yml | 2 -- compose-builder/add-device-s7.yml | 2 -- compose-builder/add-device-snmp.yml | 2 -- compose-builder/add-device-uart.yml | 2 -- compose-builder/add-device-usb-camera.yml | 2 -- compose-builder/add-device-virtual.yml | 2 -- compose-builder/add-keeper.yml | 2 -- compose-builder/add-modbus-simulator.yml | 2 -- compose-builder/add-mqtt-broker-mosquitto.yml | 2 -- compose-builder/add-mqtt-broker-nanomq.yml | 2 -- compose-builder/add-mqtt-messagebus.yml | 2 -- compose-builder/add-nats-messagebus.yml | 2 -- compose-builder/add-runtime-token-config-template.yml | 2 -- compose-builder/add-secure-consul.yml | 2 -- compose-builder/add-secure-device-mqtt.yml | 2 -- compose-builder/add-secure-keeper.yml | 2 -- compose-builder/add-secure-mqtt-broker.yml | 2 -- compose-builder/add-secure-mqtt-messagebus.yml | 2 -- compose-builder/add-secure-redis-messagebus.yml | 2 -- compose-builder/add-security-proxy.yml | 2 -- compose-builder/add-security.yml | 2 -- compose-builder/add-service-secure-template.yml | 2 -- compose-builder/add-taf-app-services-secure.yml | 2 -- compose-builder/add-taf-app-services.yml | 2 -- compose-builder/add-taf-device-services-mods.yml | 2 -- compose-builder/add-taf-mqtt-broker-mosquitto.yml | 2 -- compose-builder/add-taf-mqtt-broker-nanomq.yml | 2 -- compose-builder/docker-compose-base.yml | 6 ++++-- docker-compose-arm64.yml | 6 +++++- docker-compose-no-secty-arm64.yml | 6 +++++- docker-compose-no-secty-with-app-sample-arm64.yml | 6 +++++- docker-compose-no-secty-with-app-sample.yml | 6 +++++- docker-compose-no-secty.yml | 6 +++++- docker-compose-with-app-sample-arm64.yml | 6 +++++- docker-compose-with-app-sample.yml | 6 +++++- docker-compose-zero-trust-arm64.yml | 6 +++++- docker-compose-zero-trust.yml | 6 +++++- docker-compose.yml | 6 +++++- taf/docker-compose-taf-arm64.yml | 6 +++++- taf/docker-compose-taf-keeper-arm64.yml | 6 +++++- taf/docker-compose-taf-keeper.yml | 6 +++++- taf/docker-compose-taf-mqtt-bus-arm64.yml | 6 +++++- taf/docker-compose-taf-mqtt-bus-keeper-arm64.yml | 6 +++++- taf/docker-compose-taf-mqtt-bus-keeper.yml | 6 +++++- taf/docker-compose-taf-mqtt-bus.yml | 6 +++++- taf/docker-compose-taf-no-secty-arm64.yml | 6 +++++- taf/docker-compose-taf-no-secty-keeper-arm64.yml | 6 +++++- taf/docker-compose-taf-no-secty-keeper.yml | 6 +++++- taf/docker-compose-taf-no-secty-mqtt-bus-arm64.yml | 6 +++++- taf/docker-compose-taf-no-secty-mqtt-bus-keeper-arm64.yml | 6 +++++- taf/docker-compose-taf-no-secty-mqtt-bus-keeper.yml | 6 +++++- taf/docker-compose-taf-no-secty-mqtt-bus.yml | 6 +++++- taf/docker-compose-taf-no-secty.yml | 6 +++++- taf/docker-compose-taf-perf-arm64.yml | 6 +++++- taf/docker-compose-taf-perf-no-secty-arm64.yml | 6 +++++- taf/docker-compose-taf-perf-no-secty.yml | 6 +++++- taf/docker-compose-taf-perf.yml | 6 +++++- taf/docker-compose-taf.yml | 6 +++++- 75 files changed, 154 insertions(+), 120 deletions(-) diff --git a/compose-builder/add-app-record-replay.yml b/compose-builder/add-app-record-replay.yml index 14189433..80374388 100644 --- a/compose-builder/add-app-record-replay.yml +++ b/compose-builder/add-app-record-replay.yml @@ -13,8 +13,6 @@ # * # *******************************************************************************/ -version: '3.7' - services: app-record-replay: image: ${APP_SVC_REPOSITORY}/app-record-replay${ARCH}:${APP_RECORD_REPLAY_VERSION} diff --git a/compose-builder/add-app-rfid-llrp-inventory.yml b/compose-builder/add-app-rfid-llrp-inventory.yml index 2a92105f..2ca9fd1a 100644 --- a/compose-builder/add-app-rfid-llrp-inventory.yml +++ b/compose-builder/add-app-rfid-llrp-inventory.yml @@ -13,8 +13,6 @@ # * # *******************************************************************************/ -version: '3.7' - volumes: llrp-inventory-data: diff --git a/compose-builder/add-asc-external-mqtt-trigger.yml b/compose-builder/add-asc-external-mqtt-trigger.yml index 568d55d3..ff376a42 100644 --- a/compose-builder/add-asc-external-mqtt-trigger.yml +++ b/compose-builder/add-asc-external-mqtt-trigger.yml @@ -13,8 +13,6 @@ # * # *******************************************************************************/ -version: '3.7' - services: app-external-mqtt-trigger: image: ${APP_SVC_REPOSITORY}/app-service-configurable${ARCH}:${APP_SERVICE_CONFIG_VERSION} diff --git a/compose-builder/add-asc-http-export.yml b/compose-builder/add-asc-http-export.yml index 5eff28a6..0ea928fd 100644 --- a/compose-builder/add-asc-http-export.yml +++ b/compose-builder/add-asc-http-export.yml @@ -13,8 +13,6 @@ # * # *******************************************************************************/ -version: '3.7' - services: app-http-export: image: ${APP_SVC_REPOSITORY}/app-service-configurable${ARCH}:${APP_SERVICE_CONFIG_VERSION} diff --git a/compose-builder/add-asc-metrics-influxdb.yml b/compose-builder/add-asc-metrics-influxdb.yml index 8a33efa9..50d7b764 100644 --- a/compose-builder/add-asc-metrics-influxdb.yml +++ b/compose-builder/add-asc-metrics-influxdb.yml @@ -13,8 +13,6 @@ # * # *******************************************************************************/ -version: '3.7' - services: app-metrics-influxdb: image: ${APP_SVC_REPOSITORY}/app-service-configurable${ARCH}:${APP_SERVICE_CONFIG_VERSION} diff --git a/compose-builder/add-asc-mqtt-export.yml b/compose-builder/add-asc-mqtt-export.yml index 244f9315..e3b36737 100644 --- a/compose-builder/add-asc-mqtt-export.yml +++ b/compose-builder/add-asc-mqtt-export.yml @@ -13,8 +13,6 @@ # * # *******************************************************************************/ -version: '3.7' - services: app-mqtt-export: image: ${APP_SVC_REPOSITORY}/app-service-configurable${ARCH}:${APP_SERVICE_CONFIG_VERSION} diff --git a/compose-builder/add-asc-sample.yml b/compose-builder/add-asc-sample.yml index 6db897bf..b4826fd9 100644 --- a/compose-builder/add-asc-sample.yml +++ b/compose-builder/add-asc-sample.yml @@ -13,8 +13,6 @@ # * # *******************************************************************************/ -version: '3.7' - services: app-sample: image: ${APP_SVC_REPOSITORY}/app-service-configurable${ARCH}:${APP_SERVICE_CONFIG_VERSION} diff --git a/compose-builder/add-consul.yml b/compose-builder/add-consul.yml index 0e28467a..7cbc8826 100644 --- a/compose-builder/add-consul.yml +++ b/compose-builder/add-consul.yml @@ -13,8 +13,6 @@ # * # *******************************************************************************/ -version: '3.7' - volumes: consul-config: consul-data: diff --git a/compose-builder/add-delayed-start-services.yml b/compose-builder/add-delayed-start-services.yml index e45ca510..9c8eb71d 100644 --- a/compose-builder/add-delayed-start-services.yml +++ b/compose-builder/add-delayed-start-services.yml @@ -13,8 +13,6 @@ # * # *******************************************************************************/ -version: '3.7' - volumes: spire-ca: spire-server: diff --git a/compose-builder/add-device-bacnet-ip.yml b/compose-builder/add-device-bacnet-ip.yml index 1b2add10..b374f55b 100644 --- a/compose-builder/add-device-bacnet-ip.yml +++ b/compose-builder/add-device-bacnet-ip.yml @@ -14,8 +14,6 @@ # * # *******************************************************************************/ -version: '3.7' - services: device-bacnet-ip: image: ${DEVICE_SVC_REPOSITORY}/device-bacnet${ARCH}:${DEVICE_BACNET_VERSION} diff --git a/compose-builder/add-device-bacnet-mstp.yml b/compose-builder/add-device-bacnet-mstp.yml index efd0531a..842e1c90 100644 --- a/compose-builder/add-device-bacnet-mstp.yml +++ b/compose-builder/add-device-bacnet-mstp.yml @@ -14,8 +14,6 @@ # * # *******************************************************************************/ -version: '3.7' - services: device-bacnet-mstp: image: ${DEVICE_SVC_REPOSITORY}/device-bacnet${ARCH}:${DEVICE_BACNET_VERSION} diff --git a/compose-builder/add-device-coap.yml b/compose-builder/add-device-coap.yml index 450ab8bf..b9d40f2f 100644 --- a/compose-builder/add-device-coap.yml +++ b/compose-builder/add-device-coap.yml @@ -13,8 +13,6 @@ # * # *******************************************************************************/ -version: '3.7' - services: device-coap: image: ${DEVICE_SVC_REPOSITORY}/device-coap${ARCH}:${DEVICE_COAP_VERSION} diff --git a/compose-builder/add-device-gpio.yml b/compose-builder/add-device-gpio.yml index 8ec1cb24..966271e4 100644 --- a/compose-builder/add-device-gpio.yml +++ b/compose-builder/add-device-gpio.yml @@ -13,8 +13,6 @@ # * # *******************************************************************************/ -version: '3.7' - services: device-gpio: image: ${DEVICE_SVC_REPOSITORY}/device-gpio${ARCH}:${DEVICE_GPIO_VERSION} diff --git a/compose-builder/add-device-modbus.yml b/compose-builder/add-device-modbus.yml index dae65c31..ee1723e3 100644 --- a/compose-builder/add-device-modbus.yml +++ b/compose-builder/add-device-modbus.yml @@ -13,8 +13,6 @@ # * # *******************************************************************************/ -version: '3.7' - services: device-modbus: image: ${DEVICE_SVC_REPOSITORY}/device-modbus${ARCH}:${DEVICE_MODBUS_VERSION} diff --git a/compose-builder/add-device-mqtt.yml b/compose-builder/add-device-mqtt.yml index 914f656b..286550a5 100644 --- a/compose-builder/add-device-mqtt.yml +++ b/compose-builder/add-device-mqtt.yml @@ -13,8 +13,6 @@ # * # *******************************************************************************/ -version: '3.7' - services: device-mqtt: image: ${DEVICE_SVC_REPOSITORY}/device-mqtt${ARCH}:${DEVICE_MQTT_VERSION} diff --git a/compose-builder/add-device-onvif-camera.yml b/compose-builder/add-device-onvif-camera.yml index 747e7e73..0ad32dba 100644 --- a/compose-builder/add-device-onvif-camera.yml +++ b/compose-builder/add-device-onvif-camera.yml @@ -14,8 +14,6 @@ # limitations under the License. # -version: '3.7' - services: device-onvif-camera: image: ${DEVICE_SVC_REPOSITORY}/device-onvif-camera${ARCH}:${DEVICE_ONVIFCAM_VERSION} diff --git a/compose-builder/add-device-rest.yml b/compose-builder/add-device-rest.yml index 8133b7dd..7a403b08 100644 --- a/compose-builder/add-device-rest.yml +++ b/compose-builder/add-device-rest.yml @@ -13,8 +13,6 @@ # * # *******************************************************************************/ -version: '3.7' - services: device-rest: image: ${DEVICE_SVC_REPOSITORY}/device-rest${ARCH}:${DEVICE_REST_VERSION} diff --git a/compose-builder/add-device-rfid-llrp.yml b/compose-builder/add-device-rfid-llrp.yml index 3bc2d39f..6c8dd893 100644 --- a/compose-builder/add-device-rfid-llrp.yml +++ b/compose-builder/add-device-rfid-llrp.yml @@ -13,8 +13,6 @@ # * # *******************************************************************************/ -version: '3.7' - services: device-rfid-llrp: image: ${DEVICE_SVC_REPOSITORY}/device-rfid-llrp${ARCH}:${DEVICE_LLRP_VERSION} diff --git a/compose-builder/add-device-s7.yml b/compose-builder/add-device-s7.yml index 22a5a72a..143e6478 100644 --- a/compose-builder/add-device-s7.yml +++ b/compose-builder/add-device-s7.yml @@ -13,8 +13,6 @@ # * # *******************************************************************************/ -version: '3.7' - services: device-s7: image: ${DEVICE_SVC_REPOSITORY}/device-s7${ARCH}:${DEVICE_S7_VERSION} diff --git a/compose-builder/add-device-snmp.yml b/compose-builder/add-device-snmp.yml index 1b1e94fb..b34b0df4 100644 --- a/compose-builder/add-device-snmp.yml +++ b/compose-builder/add-device-snmp.yml @@ -13,8 +13,6 @@ # * # *******************************************************************************/ -version: '3.7' - services: device-snmp: image: ${DEVICE_SVC_REPOSITORY}/device-snmp${ARCH}:${DEVICE_SNMP_VERSION} diff --git a/compose-builder/add-device-uart.yml b/compose-builder/add-device-uart.yml index 5a46244a..64ca512f 100644 --- a/compose-builder/add-device-uart.yml +++ b/compose-builder/add-device-uart.yml @@ -13,8 +13,6 @@ # * # *******************************************************************************/ -version: '3.7' - services: device-uart: image: ${DEVICE_SVC_REPOSITORY}/device-uart${ARCH}:${DEVICE_UART_VERSION} diff --git a/compose-builder/add-device-usb-camera.yml b/compose-builder/add-device-usb-camera.yml index be4fb17a..ae7c3474 100644 --- a/compose-builder/add-device-usb-camera.yml +++ b/compose-builder/add-device-usb-camera.yml @@ -14,8 +14,6 @@ # limitations under the License. # -version: '3.7' - services: device-usb-camera: image: ${DEVICE_SVC_REPOSITORY}/device-usb-camera${ARCH}:${DEVICE_USBCAM_VERSION} diff --git a/compose-builder/add-device-virtual.yml b/compose-builder/add-device-virtual.yml index e93e30a3..a0a4237b 100644 --- a/compose-builder/add-device-virtual.yml +++ b/compose-builder/add-device-virtual.yml @@ -13,8 +13,6 @@ # * # *******************************************************************************/ -version: '3.7' - services: device-virtual: image: ${DEVICE_SVC_REPOSITORY}/device-virtual${ARCH}:${DEVICE_VIRTUAL_VERSION} diff --git a/compose-builder/add-keeper.yml b/compose-builder/add-keeper.yml index ff58aa5a..ea3532b7 100644 --- a/compose-builder/add-keeper.yml +++ b/compose-builder/add-keeper.yml @@ -13,8 +13,6 @@ # * # *******************************************************************************/ -version: '3.7' - services: keeper: image: ${CORE_EDGEX_REPOSITORY}/core-keeper${ARCH}:${CORE_EDGEX_VERSION} diff --git a/compose-builder/add-modbus-simulator.yml b/compose-builder/add-modbus-simulator.yml index fae716fb..2be381d7 100644 --- a/compose-builder/add-modbus-simulator.yml +++ b/compose-builder/add-modbus-simulator.yml @@ -13,8 +13,6 @@ # * # *******************************************************************************/ -version: '3.7' - services: modbus-simulator: image: nexus3.edgexfoundry.org:10003/edgex-devops/edgex-modbus-simulator${ARCH}:latest diff --git a/compose-builder/add-mqtt-broker-mosquitto.yml b/compose-builder/add-mqtt-broker-mosquitto.yml index e59b7436..e75d1177 100644 --- a/compose-builder/add-mqtt-broker-mosquitto.yml +++ b/compose-builder/add-mqtt-broker-mosquitto.yml @@ -13,8 +13,6 @@ # * # *******************************************************************************/ -version: '3.7' - services: mqtt-broker: image: eclipse-mosquitto:${MOSQUITTO_VERSION} diff --git a/compose-builder/add-mqtt-broker-nanomq.yml b/compose-builder/add-mqtt-broker-nanomq.yml index 73f8f196..1947346b 100644 --- a/compose-builder/add-mqtt-broker-nanomq.yml +++ b/compose-builder/add-mqtt-broker-nanomq.yml @@ -13,8 +13,6 @@ # * # *******************************************************************************/ -version: '3.7' - volumes: nanomq-log: diff --git a/compose-builder/add-mqtt-messagebus.yml b/compose-builder/add-mqtt-messagebus.yml index 340f8802..22a19688 100644 --- a/compose-builder/add-mqtt-messagebus.yml +++ b/compose-builder/add-mqtt-messagebus.yml @@ -13,8 +13,6 @@ # * # *******************************************************************************/ -version: '3.7' - services: core-common-config-bootstrapper: environment: diff --git a/compose-builder/add-nats-messagebus.yml b/compose-builder/add-nats-messagebus.yml index febf4036..1a83bdc2 100644 --- a/compose-builder/add-nats-messagebus.yml +++ b/compose-builder/add-nats-messagebus.yml @@ -13,8 +13,6 @@ # * # *******************************************************************************/ -version: '3.7' - volumes: nats-data: diff --git a/compose-builder/add-runtime-token-config-template.yml b/compose-builder/add-runtime-token-config-template.yml index 68637133..f7e258d2 100644 --- a/compose-builder/add-runtime-token-config-template.yml +++ b/compose-builder/add-runtime-token-config-template.yml @@ -13,8 +13,6 @@ # * # *******************************************************************************/ -version: '3.7' - services: ${SERVICE_NAME}: environment: diff --git a/compose-builder/add-secure-consul.yml b/compose-builder/add-secure-consul.yml index e211c1f9..cfb50da9 100644 --- a/compose-builder/add-secure-consul.yml +++ b/compose-builder/add-secure-consul.yml @@ -13,8 +13,6 @@ # * # *******************************************************************************/ -version: '3.7' - volumes: consul-acl-token: diff --git a/compose-builder/add-secure-device-mqtt.yml b/compose-builder/add-secure-device-mqtt.yml index 651e6bf7..f74dd648 100644 --- a/compose-builder/add-secure-device-mqtt.yml +++ b/compose-builder/add-secure-device-mqtt.yml @@ -13,8 +13,6 @@ # * # *******************************************************************************/ -version: '3.7' - services: device-mqtt: environment: diff --git a/compose-builder/add-secure-keeper.yml b/compose-builder/add-secure-keeper.yml index cc807cdb..c83ef305 100644 --- a/compose-builder/add-secure-keeper.yml +++ b/compose-builder/add-secure-keeper.yml @@ -13,8 +13,6 @@ # * # *******************************************************************************/ -version: '3.7' - services: keeper: command: "/core-keeper" diff --git a/compose-builder/add-secure-mqtt-broker.yml b/compose-builder/add-secure-mqtt-broker.yml index c0c258d9..9a923239 100644 --- a/compose-builder/add-secure-mqtt-broker.yml +++ b/compose-builder/add-secure-mqtt-broker.yml @@ -13,8 +13,6 @@ # * # *******************************************************************************/ -version: '3.7' - volumes: mqtt: diff --git a/compose-builder/add-secure-mqtt-messagebus.yml b/compose-builder/add-secure-mqtt-messagebus.yml index 36fdd894..d003e3a2 100644 --- a/compose-builder/add-secure-mqtt-messagebus.yml +++ b/compose-builder/add-secure-mqtt-messagebus.yml @@ -13,8 +13,6 @@ # * # *******************************************************************************/ -version: '3.7' - volumes: kuiper-sources: kuiper-connections: diff --git a/compose-builder/add-secure-redis-messagebus.yml b/compose-builder/add-secure-redis-messagebus.yml index 0564c583..80b0a930 100644 --- a/compose-builder/add-secure-redis-messagebus.yml +++ b/compose-builder/add-secure-redis-messagebus.yml @@ -13,8 +13,6 @@ # * # *******************************************************************************/ -version: '3.7' - volumes: kuiper-sources: kuiper-connections: diff --git a/compose-builder/add-security-proxy.yml b/compose-builder/add-security-proxy.yml index af0b2d38..fa251e67 100644 --- a/compose-builder/add-security-proxy.yml +++ b/compose-builder/add-security-proxy.yml @@ -13,8 +13,6 @@ # * # *******************************************************************************/ -version: '3.7' - volumes: consul-acl-token: nginx-templates: diff --git a/compose-builder/add-security.yml b/compose-builder/add-security.yml index eacc0b7a..9f67ae01 100644 --- a/compose-builder/add-security.yml +++ b/compose-builder/add-security.yml @@ -13,8 +13,6 @@ # * # *******************************************************************************/ -version: '3.7' - volumes: edgex-init: vault-config: diff --git a/compose-builder/add-service-secure-template.yml b/compose-builder/add-service-secure-template.yml index ea65674e..4bb5b740 100644 --- a/compose-builder/add-service-secure-template.yml +++ b/compose-builder/add-service-secure-template.yml @@ -13,8 +13,6 @@ # * # *******************************************************************************/ -version: '3.7' - services: security-secretstore-setup: environment: diff --git a/compose-builder/add-taf-app-services-secure.yml b/compose-builder/add-taf-app-services-secure.yml index 232ab189..a4f69ea1 100644 --- a/compose-builder/add-taf-app-services-secure.yml +++ b/compose-builder/add-taf-app-services-secure.yml @@ -13,8 +13,6 @@ # * # *******************************************************************************/ -version: '3.7' - services: security-secretstore-setup: environment: diff --git a/compose-builder/add-taf-app-services.yml b/compose-builder/add-taf-app-services.yml index 684e5466..51605a51 100644 --- a/compose-builder/add-taf-app-services.yml +++ b/compose-builder/add-taf-app-services.yml @@ -13,8 +13,6 @@ # * # *******************************************************************************/ -version: '3.7' - services: app-functional-tests: image: ${APP_SVC_REPOSITORY}/app-service-configurable${ARCH}:${APP_SERVICE_CONFIG_VERSION} diff --git a/compose-builder/add-taf-device-services-mods.yml b/compose-builder/add-taf-device-services-mods.yml index a5dafd12..8895e81f 100644 --- a/compose-builder/add-taf-device-services-mods.yml +++ b/compose-builder/add-taf-device-services-mods.yml @@ -13,8 +13,6 @@ # * # *******************************************************************************/ -version: '3.7' - services: device-virtual: command: "${CP_FLAGS} --registry --configDir=CONFIG_DIR_PLACE_HOLDER" diff --git a/compose-builder/add-taf-mqtt-broker-mosquitto.yml b/compose-builder/add-taf-mqtt-broker-mosquitto.yml index 4637e81c..b6bce0cb 100644 --- a/compose-builder/add-taf-mqtt-broker-mosquitto.yml +++ b/compose-builder/add-taf-mqtt-broker-mosquitto.yml @@ -1,5 +1,3 @@ -version: '3.7' - services: mqtt-taf-broker: image: eclipse-mosquitto:${MOSQUITTO_VERSION} diff --git a/compose-builder/add-taf-mqtt-broker-nanomq.yml b/compose-builder/add-taf-mqtt-broker-nanomq.yml index 7b92d2b5..26f093c6 100644 --- a/compose-builder/add-taf-mqtt-broker-nanomq.yml +++ b/compose-builder/add-taf-mqtt-broker-nanomq.yml @@ -1,5 +1,3 @@ -version: '3.7' - volumes: taf-nanomq-log: diff --git a/compose-builder/docker-compose-base.yml b/compose-builder/docker-compose-base.yml index cf69126b..218fd5b7 100644 --- a/compose-builder/docker-compose-base.yml +++ b/compose-builder/docker-compose-base.yml @@ -15,8 +15,6 @@ # NOTE: this Docker Compose file does not contain the security services required to run in secure mode -version: '3.7' - networks: edgex-network: driver: "bridge" @@ -61,6 +59,7 @@ services: - common-non-security.env environment: SERVICE_HOST: edgex-support-notifications + DATABASE_HOST: edgex-redis depends_on: - ${REGISTRY_TYPE} - database @@ -87,6 +86,7 @@ services: - common-non-security.env environment: SERVICE_HOST: edgex-core-metadata + DATABASE_HOST: edgex-redis depends_on: - ${REGISTRY_TYPE} - database @@ -112,6 +112,7 @@ services: - common-non-security.env environment: SERVICE_HOST: edgex-core-data + DATABASE_HOST: edgex-redis depends_on: - ${REGISTRY_TYPE} - database @@ -193,6 +194,7 @@ services: - common-non-security.env environment: SERVICE_HOST: edgex-support-scheduler + DATABASE_HOST: edgex-redis INTERVALACTIONS_SCRUBPUSHED_HOST: edgex-core-data INTERVALACTIONS_SCRUBAGED_HOST: edgex-core-data depends_on: diff --git a/docker-compose-arm64.yml b/docker-compose-arm64.yml index 7c2a399d..8ea1e476 100644 --- a/docker-compose-arm64.yml +++ b/docker-compose-arm64.yml @@ -24,7 +24,7 @@ # # From the compose-builder folder use `make build` to regenerate all standard compose files variations # -# Generated with: Docker Compose version v2.25.0 +# Generated with: Docker Compose version v2.29.1 name: edgex services: app-rules-engine: @@ -357,6 +357,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-vault @@ -430,6 +431,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-vault @@ -1133,6 +1135,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-vault @@ -1209,6 +1212,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" INTERVALACTIONS_SCRUBAGED_HOST: edgex-core-data INTERVALACTIONS_SCRUBPUSHED_HOST: edgex-core-data diff --git a/docker-compose-no-secty-arm64.yml b/docker-compose-no-secty-arm64.yml index 3cc97699..519e555d 100644 --- a/docker-compose-no-secty-arm64.yml +++ b/docker-compose-no-secty-arm64.yml @@ -24,7 +24,7 @@ # # From the compose-builder folder use `make build` to regenerate all standard compose files variations # -# Generated with: Docker Compose version v2.25.0 +# Generated with: Docker Compose version v2.29.1 name: edgex services: app-rules-engine: @@ -195,6 +195,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" SERVICE_HOST: edgex-core-data hostname: edgex-core-data @@ -232,6 +233,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" SERVICE_HOST: edgex-core-metadata hostname: edgex-core-metadata @@ -437,6 +439,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" SERVICE_HOST: edgex-support-notifications hostname: edgex-support-notifications @@ -477,6 +480,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" INTERVALACTIONS_SCRUBAGED_HOST: edgex-core-data INTERVALACTIONS_SCRUBPUSHED_HOST: edgex-core-data diff --git a/docker-compose-no-secty-with-app-sample-arm64.yml b/docker-compose-no-secty-with-app-sample-arm64.yml index 815fec4a..22444bb1 100644 --- a/docker-compose-no-secty-with-app-sample-arm64.yml +++ b/docker-compose-no-secty-with-app-sample-arm64.yml @@ -24,7 +24,7 @@ # # From the compose-builder folder use `make build` to regenerate all standard compose files variations # -# Generated with: Docker Compose version v2.25.0 +# Generated with: Docker Compose version v2.29.1 name: edgex services: app-rules-engine: @@ -239,6 +239,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" SERVICE_HOST: edgex-core-data hostname: edgex-core-data @@ -276,6 +277,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" SERVICE_HOST: edgex-core-metadata hostname: edgex-core-metadata @@ -481,6 +483,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" SERVICE_HOST: edgex-support-notifications hostname: edgex-support-notifications @@ -521,6 +524,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" INTERVALACTIONS_SCRUBAGED_HOST: edgex-core-data INTERVALACTIONS_SCRUBPUSHED_HOST: edgex-core-data diff --git a/docker-compose-no-secty-with-app-sample.yml b/docker-compose-no-secty-with-app-sample.yml index f74f3a3f..7a6f3bbc 100644 --- a/docker-compose-no-secty-with-app-sample.yml +++ b/docker-compose-no-secty-with-app-sample.yml @@ -24,7 +24,7 @@ # # From the compose-builder folder use `make build` to regenerate all standard compose files variations # -# Generated with: Docker Compose version v2.25.0 +# Generated with: Docker Compose version v2.29.1 name: edgex services: app-rules-engine: @@ -239,6 +239,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" SERVICE_HOST: edgex-core-data hostname: edgex-core-data @@ -276,6 +277,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" SERVICE_HOST: edgex-core-metadata hostname: edgex-core-metadata @@ -481,6 +483,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" SERVICE_HOST: edgex-support-notifications hostname: edgex-support-notifications @@ -521,6 +524,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" INTERVALACTIONS_SCRUBAGED_HOST: edgex-core-data INTERVALACTIONS_SCRUBPUSHED_HOST: edgex-core-data diff --git a/docker-compose-no-secty.yml b/docker-compose-no-secty.yml index e6fb187b..1b80f704 100644 --- a/docker-compose-no-secty.yml +++ b/docker-compose-no-secty.yml @@ -24,7 +24,7 @@ # # From the compose-builder folder use `make build` to regenerate all standard compose files variations # -# Generated with: Docker Compose version v2.25.0 +# Generated with: Docker Compose version v2.29.1 name: edgex services: app-rules-engine: @@ -195,6 +195,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" SERVICE_HOST: edgex-core-data hostname: edgex-core-data @@ -232,6 +233,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" SERVICE_HOST: edgex-core-metadata hostname: edgex-core-metadata @@ -437,6 +439,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" SERVICE_HOST: edgex-support-notifications hostname: edgex-support-notifications @@ -477,6 +480,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" INTERVALACTIONS_SCRUBAGED_HOST: edgex-core-data INTERVALACTIONS_SCRUBPUSHED_HOST: edgex-core-data diff --git a/docker-compose-with-app-sample-arm64.yml b/docker-compose-with-app-sample-arm64.yml index 3c1a65b1..6344b5b3 100644 --- a/docker-compose-with-app-sample-arm64.yml +++ b/docker-compose-with-app-sample-arm64.yml @@ -24,7 +24,7 @@ # # From the compose-builder folder use `make build` to regenerate all standard compose files variations # -# Generated with: Docker Compose version v2.25.0 +# Generated with: Docker Compose version v2.29.1 name: edgex services: app-rules-engine: @@ -434,6 +434,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-vault @@ -507,6 +508,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-vault @@ -1210,6 +1212,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-vault @@ -1286,6 +1289,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" INTERVALACTIONS_SCRUBAGED_HOST: edgex-core-data INTERVALACTIONS_SCRUBPUSHED_HOST: edgex-core-data diff --git a/docker-compose-with-app-sample.yml b/docker-compose-with-app-sample.yml index 7e578b2f..3597d2a0 100644 --- a/docker-compose-with-app-sample.yml +++ b/docker-compose-with-app-sample.yml @@ -24,7 +24,7 @@ # # From the compose-builder folder use `make build` to regenerate all standard compose files variations # -# Generated with: Docker Compose version v2.25.0 +# Generated with: Docker Compose version v2.29.1 name: edgex services: app-rules-engine: @@ -434,6 +434,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-vault @@ -507,6 +508,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-vault @@ -1210,6 +1212,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-vault @@ -1286,6 +1289,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" INTERVALACTIONS_SCRUBAGED_HOST: edgex-core-data INTERVALACTIONS_SCRUBPUSHED_HOST: edgex-core-data diff --git a/docker-compose-zero-trust-arm64.yml b/docker-compose-zero-trust-arm64.yml index 6f78501d..208768ee 100644 --- a/docker-compose-zero-trust-arm64.yml +++ b/docker-compose-zero-trust-arm64.yml @@ -24,7 +24,7 @@ # # From the compose-builder folder use `make build` to regenerate all standard compose files variations # -# Generated with: Docker Compose version v2.25.0 +# Generated with: Docker Compose version v2.29.1 name: edgex services: app-rules-engine: @@ -355,6 +355,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-vault @@ -423,6 +424,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-vault @@ -911,6 +913,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-vault @@ -982,6 +985,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" INTERVALACTIONS_SCRUBAGED_HOST: edgex-core-data INTERVALACTIONS_SCRUBPUSHED_HOST: edgex-core-data diff --git a/docker-compose-zero-trust.yml b/docker-compose-zero-trust.yml index 7ee76137..811a7a9d 100644 --- a/docker-compose-zero-trust.yml +++ b/docker-compose-zero-trust.yml @@ -24,7 +24,7 @@ # # From the compose-builder folder use `make build` to regenerate all standard compose files variations # -# Generated with: Docker Compose version v2.25.0 +# Generated with: Docker Compose version v2.29.1 name: edgex services: app-rules-engine: @@ -355,6 +355,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-vault @@ -423,6 +424,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-vault @@ -911,6 +913,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-vault @@ -982,6 +985,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" INTERVALACTIONS_SCRUBAGED_HOST: edgex-core-data INTERVALACTIONS_SCRUBPUSHED_HOST: edgex-core-data diff --git a/docker-compose.yml b/docker-compose.yml index 88d0da15..fb3ef9ca 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -24,7 +24,7 @@ # # From the compose-builder folder use `make build` to regenerate all standard compose files variations # -# Generated with: Docker Compose version v2.25.0 +# Generated with: Docker Compose version v2.29.1 name: edgex services: app-rules-engine: @@ -357,6 +357,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-vault @@ -430,6 +431,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-vault @@ -1133,6 +1135,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-vault @@ -1209,6 +1212,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" INTERVALACTIONS_SCRUBAGED_HOST: edgex-core-data INTERVALACTIONS_SCRUBPUSHED_HOST: edgex-core-data diff --git a/taf/docker-compose-taf-arm64.yml b/taf/docker-compose-taf-arm64.yml index cd51671a..b898ce2d 100644 --- a/taf/docker-compose-taf-arm64.yml +++ b/taf/docker-compose-taf-arm64.yml @@ -24,7 +24,7 @@ # # From the compose-builder folder use `make build` to regenerate all standard compose files variations # -# Generated with: Docker Compose version v2.25.0 +# Generated with: Docker Compose version v2.29.1 name: edgex services: app-external-mqtt-trigger: @@ -821,6 +821,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-vault @@ -894,6 +895,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-vault @@ -2171,6 +2173,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-vault @@ -2247,6 +2250,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" INTERVALACTIONS_SCRUBAGED_HOST: edgex-core-data INTERVALACTIONS_SCRUBPUSHED_HOST: edgex-core-data diff --git a/taf/docker-compose-taf-keeper-arm64.yml b/taf/docker-compose-taf-keeper-arm64.yml index 9718f05d..4668e487 100644 --- a/taf/docker-compose-taf-keeper-arm64.yml +++ b/taf/docker-compose-taf-keeper-arm64.yml @@ -24,7 +24,7 @@ # # From the compose-builder folder use `make build` to regenerate all standard compose files variations # -# Generated with: Docker Compose version v2.25.0 +# Generated with: Docker Compose version v2.29.1 name: edgex services: app-external-mqtt-trigger: @@ -740,6 +740,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-vault @@ -813,6 +814,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-vault @@ -2090,6 +2092,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-vault @@ -2166,6 +2169,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" INTERVALACTIONS_SCRUBAGED_HOST: edgex-core-data INTERVALACTIONS_SCRUBPUSHED_HOST: edgex-core-data diff --git a/taf/docker-compose-taf-keeper.yml b/taf/docker-compose-taf-keeper.yml index 84225d9e..325dbb37 100644 --- a/taf/docker-compose-taf-keeper.yml +++ b/taf/docker-compose-taf-keeper.yml @@ -24,7 +24,7 @@ # # From the compose-builder folder use `make build` to regenerate all standard compose files variations # -# Generated with: Docker Compose version v2.25.0 +# Generated with: Docker Compose version v2.29.1 name: edgex services: app-external-mqtt-trigger: @@ -740,6 +740,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-vault @@ -813,6 +814,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-vault @@ -2090,6 +2092,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-vault @@ -2166,6 +2169,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" INTERVALACTIONS_SCRUBAGED_HOST: edgex-core-data INTERVALACTIONS_SCRUBPUSHED_HOST: edgex-core-data diff --git a/taf/docker-compose-taf-mqtt-bus-arm64.yml b/taf/docker-compose-taf-mqtt-bus-arm64.yml index 4d92e8ba..03fd0f75 100644 --- a/taf/docker-compose-taf-mqtt-bus-arm64.yml +++ b/taf/docker-compose-taf-mqtt-bus-arm64.yml @@ -24,7 +24,7 @@ # # From the compose-builder folder use `make build` to regenerate all standard compose files variations # -# Generated with: Docker Compose version v2.25.0 +# Generated with: Docker Compose version v2.29.1 name: edgex services: app-external-mqtt-trigger: @@ -828,6 +828,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-vault @@ -901,6 +902,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-vault @@ -2236,6 +2238,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-vault @@ -2312,6 +2315,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" INTERVALACTIONS_SCRUBAGED_HOST: edgex-core-data INTERVALACTIONS_SCRUBPUSHED_HOST: edgex-core-data diff --git a/taf/docker-compose-taf-mqtt-bus-keeper-arm64.yml b/taf/docker-compose-taf-mqtt-bus-keeper-arm64.yml index 838eab76..5fc082c5 100644 --- a/taf/docker-compose-taf-mqtt-bus-keeper-arm64.yml +++ b/taf/docker-compose-taf-mqtt-bus-keeper-arm64.yml @@ -24,7 +24,7 @@ # # From the compose-builder folder use `make build` to regenerate all standard compose files variations # -# Generated with: Docker Compose version v2.25.0 +# Generated with: Docker Compose version v2.29.1 name: edgex services: app-external-mqtt-trigger: @@ -747,6 +747,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-vault @@ -820,6 +821,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-vault @@ -2155,6 +2157,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-vault @@ -2231,6 +2234,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" INTERVALACTIONS_SCRUBAGED_HOST: edgex-core-data INTERVALACTIONS_SCRUBPUSHED_HOST: edgex-core-data diff --git a/taf/docker-compose-taf-mqtt-bus-keeper.yml b/taf/docker-compose-taf-mqtt-bus-keeper.yml index 1e723221..c60e4a97 100644 --- a/taf/docker-compose-taf-mqtt-bus-keeper.yml +++ b/taf/docker-compose-taf-mqtt-bus-keeper.yml @@ -24,7 +24,7 @@ # # From the compose-builder folder use `make build` to regenerate all standard compose files variations # -# Generated with: Docker Compose version v2.25.0 +# Generated with: Docker Compose version v2.29.1 name: edgex services: app-external-mqtt-trigger: @@ -747,6 +747,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-vault @@ -820,6 +821,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-vault @@ -2155,6 +2157,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-vault @@ -2231,6 +2234,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" INTERVALACTIONS_SCRUBAGED_HOST: edgex-core-data INTERVALACTIONS_SCRUBPUSHED_HOST: edgex-core-data diff --git a/taf/docker-compose-taf-mqtt-bus.yml b/taf/docker-compose-taf-mqtt-bus.yml index 6922255e..48c1d5ab 100644 --- a/taf/docker-compose-taf-mqtt-bus.yml +++ b/taf/docker-compose-taf-mqtt-bus.yml @@ -24,7 +24,7 @@ # # From the compose-builder folder use `make build` to regenerate all standard compose files variations # -# Generated with: Docker Compose version v2.25.0 +# Generated with: Docker Compose version v2.29.1 name: edgex services: app-external-mqtt-trigger: @@ -828,6 +828,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-vault @@ -901,6 +902,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-vault @@ -2236,6 +2238,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-vault @@ -2312,6 +2315,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" INTERVALACTIONS_SCRUBAGED_HOST: edgex-core-data INTERVALACTIONS_SCRUBPUSHED_HOST: edgex-core-data diff --git a/taf/docker-compose-taf-no-secty-arm64.yml b/taf/docker-compose-taf-no-secty-arm64.yml index bf6baba5..6fa48de7 100644 --- a/taf/docker-compose-taf-no-secty-arm64.yml +++ b/taf/docker-compose-taf-no-secty-arm64.yml @@ -24,7 +24,7 @@ # # From the compose-builder folder use `make build` to regenerate all standard compose files variations # -# Generated with: Docker Compose version v2.25.0 +# Generated with: Docker Compose version v2.29.1 name: edgex services: app-external-mqtt-trigger: @@ -461,6 +461,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" SERVICE_HOST: edgex-core-data hostname: edgex-core-data @@ -498,6 +499,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" SERVICE_HOST: edgex-core-metadata hostname: edgex-core-metadata @@ -901,6 +903,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" SERVICE_HOST: edgex-support-notifications hostname: edgex-support-notifications @@ -941,6 +944,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" INTERVALACTIONS_SCRUBAGED_HOST: edgex-core-data INTERVALACTIONS_SCRUBPUSHED_HOST: edgex-core-data diff --git a/taf/docker-compose-taf-no-secty-keeper-arm64.yml b/taf/docker-compose-taf-no-secty-keeper-arm64.yml index 17bf2a4c..eb8c1663 100644 --- a/taf/docker-compose-taf-no-secty-keeper-arm64.yml +++ b/taf/docker-compose-taf-no-secty-keeper-arm64.yml @@ -24,7 +24,7 @@ # # From the compose-builder folder use `make build` to regenerate all standard compose files variations # -# Generated with: Docker Compose version v2.25.0 +# Generated with: Docker Compose version v2.29.1 name: edgex services: app-external-mqtt-trigger: @@ -428,6 +428,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" SERVICE_HOST: edgex-core-data hostname: edgex-core-data @@ -465,6 +466,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" SERVICE_HOST: edgex-core-metadata hostname: edgex-core-metadata @@ -868,6 +870,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" SERVICE_HOST: edgex-support-notifications hostname: edgex-support-notifications @@ -908,6 +911,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" INTERVALACTIONS_SCRUBAGED_HOST: edgex-core-data INTERVALACTIONS_SCRUBPUSHED_HOST: edgex-core-data diff --git a/taf/docker-compose-taf-no-secty-keeper.yml b/taf/docker-compose-taf-no-secty-keeper.yml index 552a1063..29e4e82c 100644 --- a/taf/docker-compose-taf-no-secty-keeper.yml +++ b/taf/docker-compose-taf-no-secty-keeper.yml @@ -24,7 +24,7 @@ # # From the compose-builder folder use `make build` to regenerate all standard compose files variations # -# Generated with: Docker Compose version v2.25.0 +# Generated with: Docker Compose version v2.29.1 name: edgex services: app-external-mqtt-trigger: @@ -428,6 +428,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" SERVICE_HOST: edgex-core-data hostname: edgex-core-data @@ -465,6 +466,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" SERVICE_HOST: edgex-core-metadata hostname: edgex-core-metadata @@ -868,6 +870,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" SERVICE_HOST: edgex-support-notifications hostname: edgex-support-notifications @@ -908,6 +911,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" INTERVALACTIONS_SCRUBAGED_HOST: edgex-core-data INTERVALACTIONS_SCRUBPUSHED_HOST: edgex-core-data 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 1df07d30..c22ae76b 100644 --- a/taf/docker-compose-taf-no-secty-mqtt-bus-arm64.yml +++ b/taf/docker-compose-taf-no-secty-mqtt-bus-arm64.yml @@ -24,7 +24,7 @@ # # From the compose-builder folder use `make build` to regenerate all standard compose files variations # -# Generated with: Docker Compose version v2.25.0 +# Generated with: Docker Compose version v2.29.1 name: edgex services: app-external-mqtt-trigger: @@ -465,6 +465,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" SERVICE_HOST: edgex-core-data hostname: edgex-core-data @@ -502,6 +503,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" SERVICE_HOST: edgex-core-metadata hostname: edgex-core-metadata @@ -917,6 +919,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" SERVICE_HOST: edgex-support-notifications hostname: edgex-support-notifications @@ -957,6 +960,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" INTERVALACTIONS_SCRUBAGED_HOST: edgex-core-data INTERVALACTIONS_SCRUBPUSHED_HOST: edgex-core-data diff --git a/taf/docker-compose-taf-no-secty-mqtt-bus-keeper-arm64.yml b/taf/docker-compose-taf-no-secty-mqtt-bus-keeper-arm64.yml index d5397acf..cc626886 100644 --- a/taf/docker-compose-taf-no-secty-mqtt-bus-keeper-arm64.yml +++ b/taf/docker-compose-taf-no-secty-mqtt-bus-keeper-arm64.yml @@ -24,7 +24,7 @@ # # From the compose-builder folder use `make build` to regenerate all standard compose files variations # -# Generated with: Docker Compose version v2.25.0 +# Generated with: Docker Compose version v2.29.1 name: edgex services: app-external-mqtt-trigger: @@ -432,6 +432,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" SERVICE_HOST: edgex-core-data hostname: edgex-core-data @@ -469,6 +470,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" SERVICE_HOST: edgex-core-metadata hostname: edgex-core-metadata @@ -884,6 +886,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" SERVICE_HOST: edgex-support-notifications hostname: edgex-support-notifications @@ -924,6 +927,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" INTERVALACTIONS_SCRUBAGED_HOST: edgex-core-data INTERVALACTIONS_SCRUBPUSHED_HOST: edgex-core-data diff --git a/taf/docker-compose-taf-no-secty-mqtt-bus-keeper.yml b/taf/docker-compose-taf-no-secty-mqtt-bus-keeper.yml index a395cbc9..1ad82dfa 100644 --- a/taf/docker-compose-taf-no-secty-mqtt-bus-keeper.yml +++ b/taf/docker-compose-taf-no-secty-mqtt-bus-keeper.yml @@ -24,7 +24,7 @@ # # From the compose-builder folder use `make build` to regenerate all standard compose files variations # -# Generated with: Docker Compose version v2.25.0 +# Generated with: Docker Compose version v2.29.1 name: edgex services: app-external-mqtt-trigger: @@ -432,6 +432,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" SERVICE_HOST: edgex-core-data hostname: edgex-core-data @@ -469,6 +470,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" SERVICE_HOST: edgex-core-metadata hostname: edgex-core-metadata @@ -884,6 +886,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" SERVICE_HOST: edgex-support-notifications hostname: edgex-support-notifications @@ -924,6 +927,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" INTERVALACTIONS_SCRUBAGED_HOST: edgex-core-data INTERVALACTIONS_SCRUBPUSHED_HOST: edgex-core-data diff --git a/taf/docker-compose-taf-no-secty-mqtt-bus.yml b/taf/docker-compose-taf-no-secty-mqtt-bus.yml index e818cc00..e688ba28 100644 --- a/taf/docker-compose-taf-no-secty-mqtt-bus.yml +++ b/taf/docker-compose-taf-no-secty-mqtt-bus.yml @@ -24,7 +24,7 @@ # # From the compose-builder folder use `make build` to regenerate all standard compose files variations # -# Generated with: Docker Compose version v2.25.0 +# Generated with: Docker Compose version v2.29.1 name: edgex services: app-external-mqtt-trigger: @@ -465,6 +465,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" SERVICE_HOST: edgex-core-data hostname: edgex-core-data @@ -502,6 +503,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" SERVICE_HOST: edgex-core-metadata hostname: edgex-core-metadata @@ -917,6 +919,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" SERVICE_HOST: edgex-support-notifications hostname: edgex-support-notifications @@ -957,6 +960,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" INTERVALACTIONS_SCRUBAGED_HOST: edgex-core-data INTERVALACTIONS_SCRUBPUSHED_HOST: edgex-core-data diff --git a/taf/docker-compose-taf-no-secty.yml b/taf/docker-compose-taf-no-secty.yml index c8c39bbd..ce1935d6 100644 --- a/taf/docker-compose-taf-no-secty.yml +++ b/taf/docker-compose-taf-no-secty.yml @@ -24,7 +24,7 @@ # # From the compose-builder folder use `make build` to regenerate all standard compose files variations # -# Generated with: Docker Compose version v2.25.0 +# Generated with: Docker Compose version v2.29.1 name: edgex services: app-external-mqtt-trigger: @@ -461,6 +461,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" SERVICE_HOST: edgex-core-data hostname: edgex-core-data @@ -498,6 +499,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" SERVICE_HOST: edgex-core-metadata hostname: edgex-core-metadata @@ -901,6 +903,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" SERVICE_HOST: edgex-support-notifications hostname: edgex-support-notifications @@ -941,6 +944,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" INTERVALACTIONS_SCRUBAGED_HOST: edgex-core-data INTERVALACTIONS_SCRUBPUSHED_HOST: edgex-core-data diff --git a/taf/docker-compose-taf-perf-arm64.yml b/taf/docker-compose-taf-perf-arm64.yml index 20b657d7..13cbc955 100644 --- a/taf/docker-compose-taf-perf-arm64.yml +++ b/taf/docker-compose-taf-perf-arm64.yml @@ -24,7 +24,7 @@ # # From the compose-builder folder use `make build` to regenerate all standard compose files variations # -# Generated with: Docker Compose version v2.25.0 +# Generated with: Docker Compose version v2.29.1 name: edgex services: app-mqtt-export: @@ -434,6 +434,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-vault @@ -507,6 +508,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-vault @@ -1523,6 +1525,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-vault @@ -1599,6 +1602,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" INTERVALACTIONS_SCRUBAGED_HOST: edgex-core-data INTERVALACTIONS_SCRUBPUSHED_HOST: edgex-core-data diff --git a/taf/docker-compose-taf-perf-no-secty-arm64.yml b/taf/docker-compose-taf-perf-no-secty-arm64.yml index 152af820..3d67841d 100644 --- a/taf/docker-compose-taf-perf-no-secty-arm64.yml +++ b/taf/docker-compose-taf-perf-no-secty-arm64.yml @@ -24,7 +24,7 @@ # # From the compose-builder folder use `make build` to regenerate all standard compose files variations # -# Generated with: Docker Compose version v2.25.0 +# Generated with: Docker Compose version v2.29.1 name: edgex services: app-mqtt-export: @@ -239,6 +239,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" SERVICE_HOST: edgex-core-data hostname: edgex-core-data @@ -276,6 +277,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" SERVICE_HOST: edgex-core-metadata hostname: edgex-core-metadata @@ -523,6 +525,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" SERVICE_HOST: edgex-support-notifications hostname: edgex-support-notifications @@ -563,6 +566,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" INTERVALACTIONS_SCRUBAGED_HOST: edgex-core-data INTERVALACTIONS_SCRUBPUSHED_HOST: edgex-core-data diff --git a/taf/docker-compose-taf-perf-no-secty.yml b/taf/docker-compose-taf-perf-no-secty.yml index 6606af27..ef4a00ec 100644 --- a/taf/docker-compose-taf-perf-no-secty.yml +++ b/taf/docker-compose-taf-perf-no-secty.yml @@ -24,7 +24,7 @@ # # From the compose-builder folder use `make build` to regenerate all standard compose files variations # -# Generated with: Docker Compose version v2.25.0 +# Generated with: Docker Compose version v2.29.1 name: edgex services: app-mqtt-export: @@ -239,6 +239,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" SERVICE_HOST: edgex-core-data hostname: edgex-core-data @@ -276,6 +277,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" SERVICE_HOST: edgex-core-metadata hostname: edgex-core-metadata @@ -523,6 +525,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" SERVICE_HOST: edgex-support-notifications hostname: edgex-support-notifications @@ -563,6 +566,7 @@ services: condition: service_started required: true environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "false" INTERVALACTIONS_SCRUBAGED_HOST: edgex-core-data INTERVALACTIONS_SCRUBPUSHED_HOST: edgex-core-data diff --git a/taf/docker-compose-taf-perf.yml b/taf/docker-compose-taf-perf.yml index 4e7ef35f..c8d12749 100644 --- a/taf/docker-compose-taf-perf.yml +++ b/taf/docker-compose-taf-perf.yml @@ -24,7 +24,7 @@ # # From the compose-builder folder use `make build` to regenerate all standard compose files variations # -# Generated with: Docker Compose version v2.25.0 +# Generated with: Docker Compose version v2.29.1 name: edgex services: app-mqtt-export: @@ -434,6 +434,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-vault @@ -507,6 +508,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-vault @@ -1523,6 +1525,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-vault @@ -1599,6 +1602,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" INTERVALACTIONS_SCRUBAGED_HOST: edgex-core-data INTERVALACTIONS_SCRUBPUSHED_HOST: edgex-core-data diff --git a/taf/docker-compose-taf.yml b/taf/docker-compose-taf.yml index bb44e4e0..8d6c5b14 100644 --- a/taf/docker-compose-taf.yml +++ b/taf/docker-compose-taf.yml @@ -24,7 +24,7 @@ # # From the compose-builder folder use `make build` to regenerate all standard compose files variations # -# Generated with: Docker Compose version v2.25.0 +# Generated with: Docker Compose version v2.29.1 name: edgex services: app-external-mqtt-trigger: @@ -821,6 +821,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-vault @@ -894,6 +895,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-vault @@ -2171,6 +2173,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" PROXY_SETUP_HOST: edgex-security-proxy-setup SECRETSTORE_HOST: edgex-vault @@ -2247,6 +2250,7 @@ services: entrypoint: - /edgex-init/ready_to_run_wait_install.sh environment: + DATABASE_HOST: edgex-redis EDGEX_SECURITY_SECRET_STORE: "true" INTERVALACTIONS_SCRUBAGED_HOST: edgex-core-data INTERVALACTIONS_SCRUBPUSHED_HOST: edgex-core-data