From f19dae76ee7c8fbab40dc6ce73d3feebee2014e2 Mon Sep 17 00:00:00 2001
From: Ivan <mumumumushu@gmail.com>
Date: Tue, 11 Mar 2025 12:24:42 +0800
Subject: [PATCH] fix: remove useless options

---
 Dockerfile        |  3 ++-
 config/deploy.yml | 12 +++---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6e39968..14dfd51 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -74,7 +74,8 @@ ENTRYPOINT ["/rails/bin/docker-entrypoint"]
 EXPOSE 3000
 
 # 添加健康检查，使用简单的curl请求检查应用是否响应
-HEALTHCHECK --interval=5s --timeout=3s --start-period=30s --retries=3 \
+# 增加start-period到120秒，给应用更多启动时间
+HEALTHCHECK --interval=10s --timeout=5s --start-period=120s --retries=10 \
   CMD curl -f http://localhost:3000/ || exit 1
 
 # 使用正确的路径启动Rails服务器，并指定端口为3000
diff --git a/config/deploy.yml b/config/deploy.yml
index 6d8425d..7ead553 100644
--- a/config/deploy.yml
+++ b/config/deploy.yml
@@ -130,7 +130,7 @@ asset_path: false
 
 # Deployment configuration for better reliability
 # 增加部署超时时间，给应用更多时间启动
-deploy_timeout: 180
+deploy_timeout: 300
 
 # 增加容器排水超时时间
 drain_timeout: 60
@@ -138,14 +138,8 @@ drain_timeout: 60
 # 增加容器启动后的就绪延迟
 readiness_delay: 30
 
-# 配置健康检查参数
-health_check:
-  # 健康检查超时时间
-  timeout: 5
-  # 健康检查间隔
-  interval: 5
-  # 健康检查重试次数
-  retries: 12
+# Kamal使用Docker的健康检查，不需要额外配置
+# 健康检查已在Dockerfile中通过HEALTHCHECK指令配置
 
 # Note: Run the setup script manually before deployment:
 # scp ./bin/setup_volumes.sh root@45.78.59.154:/root/setup_volumes.sh
--
libgit2 0.27.1