fix: Use postgres as default database

Signed-off-by: Cherry Wang <[email protected]>
edgexfoundry · Oct 30, 2024 · 67255dd · 67255dd
1 parent a2c956d
commit 67255dd
Show file tree

Hide file tree

Showing 83 changed files with 4,370 additions and 32,811 deletions.
diff --git a/compose-builder/.env b/compose-builder/.env
@@ -42,23 +42,19 @@ DEVICE_UART_VERSION=latest
 DEVICE_ONVIFCAM_VERSION=latest
 DEVICE_USBCAM_VERSION=latest
 DEVICE_S7_VERSION=latest
-CP_FLAGS='-cp=consul.http://edgex-core-consul:8500'
-REGISTRY_HOST=edgex-core-consul
-REGISTRY_PORT=8500
-REGISTRY_TYPE=consul
-DATABASE_HOST=edgex-redis
-DATABASE_TYPE=redisdb
-DATABASE_PORT=6379
-MESSAGEBUS_HOST=edgex-redis
-MESSAGEBUS_SECRETNAME=redisdb
-MESSAGEBUS_AUTHMODE=none
-MESSAGEBUS_PORT=6379
-MESSAGEBUS_PROTOCOL=redis
-MESSAGEBUS_TYPE=redis
-WRITABLE_INSECURESECRETS_DB_SECRETNAME=redisdb
-WRITABLE_INSECURESECRETS_DB_SECRETDATA_USERNAME=
-WRITABLE_INSECURESECRETS_DB_SECRETDATA_PASSWORD=
-COMMON_SEC_STAGE_GATE_FILE_NAME=common-sec-stage-gate.env
+CP_FLAGS='-cp=keeper.http://edgex-core-keeper:59890'
+DATABASE_HOST=edgex-postgres
+DATABASE_TYPE=postgres
+DATABASE_PORT=5432
+MESSAGEBUS_HOST=edgex-mqtt-broker
+MESSAGEBUS_SECRETNAME=message-bus
+MESSAGEBUS_AUTHMODE=usernamepassword
+MESSAGEBUS_PORT=1883
+MESSAGEBUS_PROTOCOL=tcp
+MESSAGEBUS_TYPE=mqtt
+WRITABLE_INSECURESECRETS_DB_SECRETNAME=postgres
+WRITABLE_INSECURESECRETS_DB_SECRETDATA_USERNAME=postgres
+WRITABLE_INSECURESECRETS_DB_SECRETDATA_PASSWORD=postgres
 
 # Lock on OpenBao 2.0 (last MPL-2.0 version)
 BAO_VERSION=2.0