From 16b1cafb5961499e65711d7c10b9baf8c8d408f4 Mon Sep 17 00:00:00 2001
From: jingrow <support@jingrow.com>
Date: Mon, 11 Aug 2025 16:23:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E8=A3=85docker=E5=90=8E=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E9=95=9C=E5=83=8F=E4=BB=93=E5=BA=93=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=E4=B8=BA=E9=98=BF=E9=87=8C=E4=BA=91=E4=BB=93=E5=BA=93=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jsite.sh       | 28 +++++++++++++++++
 test_status.sh | 81 --------------------------------------------------
 2 files changed, 28 insertions(+), 81 deletions(-)
 delete mode 100644 test_status.sh

diff --git a/jsite.sh b/jsite.sh
index 250fa0a..9b0a938 100644
--- a/jsite.sh
+++ b/jsite.sh
@@ -1140,6 +1140,34 @@ install_docker() {
         log_success "Docker安装完成"
     fi
     
+    # 配置Docker镜像仓库地址
+    log_info "配置Docker镜像仓库地址..."
+    
+    # 创建Docker配置目录
+    mkdir -p /etc/docker
+    
+    # 创建或更新daemon.json配置文件
+    cat > /etc/docker/daemon.json << EOF
+{
+  "registry-mirrors": [
+    "https://k487mmwn.mirror.aliyuncs.com"
+  ]
+}
+EOF
+    
+    # 重新加载systemd配置并重启Docker服务
+    log_info "重新加载systemd配置并重启Docker服务..."
+    systemctl daemon-reload
+    systemctl restart docker
+    
+    # 验证配置是否生效
+    log_info "验证Docker镜像仓库配置..."
+    if docker info | grep -q "k487mmwn.mirror.aliyuncs.com"; then
+        log_success "Docker镜像仓库配置成功"
+    else
+        log_warning "Docker镜像仓库配置可能未生效，请手动检查"
+    fi
+    
     # 将jingrow用户添加到docker组
     usermod -aG docker jingrow
     log_success "将jingrow用户添加到docker组"
diff --git a/test_status.sh b/test_status.sh
deleted file mode 100644
index da0d264..0000000
--- a/test_status.sh
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/bash
-
-# 测试修复后的状态检测功能
-echo "=== 测试修复后的状态检测功能 ==="
-
-# 测试get_site_status函数
-test_get_site_status() {
-    echo "测试 get_site_status 函数..."
-    
-    # 模拟PM2 list输出
-    echo "模拟PM2 list输出:"
-    echo "┌─────┬────────────────┬──────────────┬─────────┬─────────┬──────────┬────────┬──────┬───────────┬──────────┬──────────┬──────────┬──────────┐"
-    echo "│ id  │ name           │ namespace   │ version │ mode    │ pid      │ uptime │ ↺    │ status    │ cpu      │ mem      │ user     │ watching │"
-    echo "├─────┼────────────────┼──────────────┼─────────┼─────────┼──────────┼────────┼──────┼───────────┼──────────┼──────────┼──────────┼──────────┤"
-    echo "│ 0   │ jingrow        │ default     │ 1.0.0   │ fork    │ 12345    │ 2D     │ 0    │ online    │ 0%       │ 45.0mb  │ jingrow  │ disabled │"
-    echo "│ 1   │ testapp        │ default     │ 1.0.0   │ fork    │ 12346    │ 0s     │ 0    │ stopped   │ 0%       │ 0b      │ jingrow  │ disabled │"
-    echo "│ 2   │ erroredapp     │ default     │ 1.0.0   │ fork    │ 0        │ 0s     │ 5    │ errored   │ 0%       │ 0b      │ jingrow  │ disabled │"
-    echo "└─────┴────────────────┴──────────────┴─────────┴─────────┴──────────┴────────┴──────┴───────────┴──────────┴──────────┴──────────┴──────────┘"
-    
-    echo ""
-    echo "状态解析说明:"
-    echo "- jingrow: 状态为 'online' -> 应该返回 'running'"
-    echo "- testapp: 状态为 'stopped' -> 应该返回 'stopped'"
-    echo "- erroredapp: 状态为 'errored' -> 应该返回 'error'"
-}
-
-# 测试端口检测
-test_port_detection() {
-    echo ""
-    echo "=== 测试端口检测功能 ==="
-    
-    # 检查常用端口
-    local ports=(3001 3002 8080 80 443)
-    
-    for port in "${ports[@]}"; do
-        echo "检查端口 $port:"
-        if netstat -tlnp 2>/dev/null | grep -q ":$port "; then
-            echo "  ✓ 端口 $port 正在监听 (netstat)"
-        elif ss -tlnp 2>/dev/null | grep -q ":$port "; then
-            echo "  ✓ 端口 $port 正在监听 (ss)"
-        else
-            echo "  ✗ 端口 $port 未被监听"
-        fi
-    done
-}
-
-# 测试PM2命令可用性
-test_pm2_availability() {
-    echo ""
-    echo "=== 测试PM2命令可用性 ==="
-    
-    # 检查jingrow用户的PM2
-    echo "检查jingrow用户的PM2:"
-    if su - jingrow -c "command -v pm2" 2>/dev/null; then
-        echo "  ✓ PM2命令可用"
-        
-        # 检查PM2版本
-        local pm2_version=$(su - jingrow -c "pm2 -v" 2>/dev/null)
-        if [ -n "$pm2_version" ]; then
-            echo "  ✓ PM2版本: $pm2_version"
-        else
-            echo "  ✗ 无法获取PM2版本"
-        fi
-        
-        # 检查PM2进程列表
-        echo "  PM2进程列表:"
-        su - jingrow -c "pm2 list" 2>/dev/null || echo "    ✗ 无法获取PM2进程列表"
-    else
-        echo "  ✗ PM2命令不可用"
-    fi
-}
-
-# 运行测试
-test_get_site_status
-test_port_detection
-test_pm2_availability
-
-echo ""
-echo "=== 测试完成 ==="
-echo "现在可以运行修复后的脚本:"
-echo "  /tmp/jsite.sh --mode status --site-name jingrow" 
\ No newline at end of file