From 96420624862ed84b5ca1fbd6f257703458fe895c Mon Sep 17 00:00:00 2001
From: zhuhoujiu <zhuhoujiu@winc-link.com>
Date: Sun, 9 Feb 2025 13:42:12 +0800
Subject: [PATCH] add config

---
 Makefile                                      |  2 +-
 cmd/hummingbird-core/Dockerfile               |  3 +-
 .../res/configuration.toml.dist               |  4 +-
 manifest/docker/config/configuration.toml     | 50 +++++++++++++++++++
 manifest/docker/docker-compose.yml            |  1 +
 5 files changed, 56 insertions(+), 4 deletions(-)
 create mode 100644 manifest/docker/config/configuration.toml

diff --git a/Makefile b/Makefile
index efa2865..f976a5f 100644
--- a/Makefile
+++ b/Makefile
@@ -18,5 +18,5 @@ start:
 
 .PHONY: build
 build:
-	docker buildx build --platform linux/amd64 -t "" -f cmd/hummingbird-core/Dockerfile --push .
+	docker buildx build --platform linux/amd64 -t "registry.cn-shanghai.aliyuncs.com/winc-link/hummingbird-core:v1.0" -f cmd/hummingbird-core/Dockerfile --push .
 
diff --git a/cmd/hummingbird-core/Dockerfile b/cmd/hummingbird-core/Dockerfile
index d7e28e4..377b3a9 100644
--- a/cmd/hummingbird-core/Dockerfile
+++ b/cmd/hummingbird-core/Dockerfile
@@ -27,7 +27,7 @@ COPY . .
 RUN make cmd/hummingbird-core/hummingbird-core
 
 #Next image - Copy built Go binary into new workspace
-FROM alpine:3.16
+FROM registry.cn-shanghai.aliyuncs.com/winc-edgex/alpine:3.12
 
 ENV APP_PORT=58081
 ENV WEB_PORT=3000
@@ -38,7 +38,6 @@ WORKDIR /var/bin/
 
 
 COPY --from=builder /edge/cmd/hummingbird-core/hummingbird-core /bin/
-COPY --from=builder /edge/cmd/hummingbird-core/res/configuration.toml.dist /etc/hummingbird-core/configuration.toml
 COPY --from=builder /edge/cmd/hummingbird-ui/build /var/bin/cmd/hummingbird-ui/build
 
 CMD ["/bin/sh", "-c", "/bin/hummingbird-core --confdir=/etc/hummingbird-core/configuration.toml"]
diff --git a/cmd/hummingbird-core/res/configuration.toml.dist b/cmd/hummingbird-core/res/configuration.toml.dist
index ea703c6..fa3b3a8 100644
--- a/cmd/hummingbird-core/res/configuration.toml.dist
+++ b/cmd/hummingbird-core/res/configuration.toml.dist
@@ -32,13 +32,15 @@ Timeout = 120
 Type = 'sqlite'
 DataSource = 'hummingbird/db-data/core-data/core.db?_timeout=5000'
 #Type = 'mysql'
-#Dsn = 'root:123456@tcp(127.0.0.1:3306)/open-hummingbird?charset=utf8mb4&parseTime=True&loc=Local'
+#Dsn = 'root:123456@tcp(127.0.0.1:3306)/hummingbird?charset=utf8mb4&parseTime=True&loc=Local'
 
 
 [Databases.Data]
 [Databases.Data.Primary]
 Type = 'leveldb'
 DataSource = 'hummingbird/db-data/leveldb-core-data/'
+#Type = 'tdengine'
+#Dsn = 'root:taosdata@ws(127.0.0.1:6041)/hummingbird'
 
 [MessageQueue]
 Protocol = 'tcp'
diff --git a/manifest/docker/config/configuration.toml b/manifest/docker/config/configuration.toml
new file mode 100644
index 0000000..fa3b3a8
--- /dev/null
+++ b/manifest/docker/config/configuration.toml
@@ -0,0 +1,50 @@
+[Writable]
+LogLevel = 'INFO'
+LogPath = 'hummingbird/logs/hummingbird-core.log'
+
+[Service]
+Host = '0.0.0.0'
+ServerBindAddr = '' # Leave blank so default to Host value unless different value is needed.
+Port = 58081
+Protocol = 'http'
+Timeout = 45000
+
+[RpcServer]
+Address = '0.0.0.0:57081'
+UseTLS = false
+CertFile = ''
+KeyFile = ''
+
+[Clients]
+[Clients.Ekuiper]
+Protocol = 'http'
+Host = 'ekuiper'
+Port = 9081
+
+[WebServer]
+Host = '0.0.0.0'
+Port = 3000
+Timeout = 120
+
+[Databases]
+[Databases.Metadata]
+[Databases.Metadata.Primary]
+Type = 'sqlite'
+DataSource = 'hummingbird/db-data/core-data/core.db?_timeout=5000'
+#Type = 'mysql'
+#Dsn = 'root:123456@tcp(127.0.0.1:3306)/hummingbird?charset=utf8mb4&parseTime=True&loc=Local'
+
+
+[Databases.Data]
+[Databases.Data.Primary]
+Type = 'leveldb'
+DataSource = 'hummingbird/db-data/leveldb-core-data/'
+#Type = 'tdengine'
+#Dsn = 'root:taosdata@ws(127.0.0.1:6041)/hummingbird'
+
+[MessageQueue]
+Protocol = 'tcp'
+Host = 'mqtt-broker'
+Port = 58090
+Type = 'mqtt'
+PublishTopicPrefix = 'eventbus/in'
diff --git a/manifest/docker/docker-compose.yml b/manifest/docker/docker-compose.yml
index 544a226..d4cd92b 100644
--- a/manifest/docker/docker-compose.yml
+++ b/manifest/docker/docker-compose.yml
@@ -44,5 +44,6 @@ services:
     volumes:
       - ./:/var/bin/hummingbird
       - /var/run/docker.sock:/var/run/docker.sock
+      - ./config/configuration.toml:/etc/hummingbird/configuration.toml
     networks:
       - hummingbird