From c1b77953c5549f7e585a484b119be36e052a8edb Mon Sep 17 00:00:00 2001
From: EdgeGo <80612608+edgego@users.noreply.github.com>
Date: Thu, 19 Oct 2023 08:46:32 +0800
Subject: [PATCH 1/3] Update libuv_CMakeLists.txt.in

compiling error from alpine, need upgrade from 1.44.2 to 1.46.0
---
 cmake/libuv_CMakeLists.txt.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/libuv_CMakeLists.txt.in b/cmake/libuv_CMakeLists.txt.in
index 9c48ddefef..3e259024b2 100644
--- a/cmake/libuv_CMakeLists.txt.in
+++ b/cmake/libuv_CMakeLists.txt.in
@@ -2,7 +2,7 @@
 # libuv
 ExternalProject_Add(libuv
         GIT_REPOSITORY https://github.com/libuv/libuv.git
-        GIT_TAG v1.44.2
+        GIT_TAG v1.46.0
         SOURCE_DIR "${TD_CONTRIB_DIR}/libuv"
         BINARY_DIR "${TD_CONTRIB_DIR}/libuv"
         CONFIGURE_COMMAND "" 

From e55961068fc9bd0dd2fa5f8b1a59282ec8112783 Mon Sep 17 00:00:00 2001
From: Yann Diorcet <yann.diorcet@retrofleet.fr>
Date: Fri, 27 Oct 2023 14:16:36 +0200
Subject: [PATCH 2/3] CMake: support build without COS

---
 source/dnode/vnode/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/dnode/vnode/CMakeLists.txt b/source/dnode/vnode/CMakeLists.txt
index 84d54f3350..4eef8b9d1b 100644
--- a/source/dnode/vnode/CMakeLists.txt
+++ b/source/dnode/vnode/CMakeLists.txt
@@ -163,6 +163,7 @@ target_link_libraries(
 
 if(${TD_LINUX})
 set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
+if(${BUILD_WITH_COS})
 find_library(APR_LIBRARY apr-1 PATHS /usr/local/apr/lib/)
 find_library(APR_UTIL_LIBRARY aprutil-1 PATHS /usr/local/apr/lib/)
 find_library(MINIXML_LIBRARY mxml)
@@ -194,7 +195,6 @@ target_include_directories(
   PUBLIC "$ENV{HOME}/.cos-local.1/include"
   )
 
-if(${BUILD_WITH_COS})
   add_definitions(-DUSE_COS)
 endif(${BUILD_WITH_COS})
 

From aaf3de42ef2aee3d646035d96405227e170f2bfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A4=E8=83=86=E6=9E=AA=E6=89=8B?=
 <37200724+alona789@users.noreply.github.com>
Date: Tue, 5 Dec 2023 09:22:49 +0800
Subject: [PATCH 3/3] Update 02-docker.md

---
 docs/zh/10-deployment/02-docker.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/zh/10-deployment/02-docker.md b/docs/zh/10-deployment/02-docker.md
index 3dbfabca7d..83e624224d 100644
--- a/docs/zh/10-deployment/02-docker.md
+++ b/docs/zh/10-deployment/02-docker.md
@@ -457,7 +457,7 @@ services:
 
 ## 使用 docker swarm 部署
 
-如果要想将基于容器的 TDengine 集群部署在多台主机上，可以使用 docker swarm。首先要在这些主机上建立 docke swarm 集群，请参考 docker 官方文档。
+如果要想将基于容器的 TDengine 集群部署在多台主机上，可以使用 docker swarm。首先要在这些主机上建立 docker swarm 集群，请参考 docker 官方文档。
 
 docker-compose 文件可以参考上节。下面是使用 docker swarm 启动 TDengine 的命令：