Merge pull request #456 from cloudxxx8/issue-455

fix: Added DATABASE_HOST env variable
edgexfoundry · Aug 26, 2024 · 08e453d · 08e453d
2 parents 224bc85 + a08dc49
commit 08e453d
Show file tree

Hide file tree

Showing 75 changed files with 154 additions and 120 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,5 +1,3 @@
-version: '3.7'
-
 volumes:
   taf-nanomq-log:
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,8 +13,6 @@ @@
     #  *
     #  *******************************************************************************/
-    version: '3.7'
     volumes:
       mqtt:
@@ Expand Down @@