From ee80d6eee5d87bea0125e268e18c3c5fc0243b45 Mon Sep 17 00:00:00 2001
From: augushong <augushong@163.com>
Date: Tue, 24 Sep 2024 21:46:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4dockerfile=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/run.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/run.sh b/docker/run.sh
index 5010324..e22c3f5 100644
--- a/docker/run.sh
+++ b/docker/run.sh
@@ -11,8 +11,6 @@ cp /var/www/html/docker/zz-phpfpm.conf /usr/local/etc/php-fpm.d
 
 # 运行redis
 # nohup redis-server --requirepass "" &
-# 运行定时任务
-nohup php /var/www/html/think timer --local --quit &
 
 # 输出参数
 echo "参数为：$@"
@@ -20,6 +18,8 @@ echo "参数为：$@"
 # TODO：增加自动批量运行并阻塞的脚本，比如：group default ，会调用auto.sh的default的部分，最终阻塞，auth.sh的default部分，可能会运行一系列的命令，比如清空缓存，踢人下线，重置密码
 
 if [ "$1" = "server" ] || [ "$1" = "" ]; then
+    # 运行定时任务
+    nohup php /var/www/html/think timer --local --quit &
     # 运行nginx
     service nginx start
     # 运行php-fpm