From 9bda15d4007a494c601d238e3755227721631d54 Mon Sep 17 00:00:00 2001 From: cfdaily Date: Sat, 11 Apr 2026 21:58:43 +0800 Subject: [PATCH] auto-sync: 2026-04-11 21:58:43 --- auto-sync-cron.log | 3 +++ docker/Dockerfile | 6 +++++- logs/auto-sync.log | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/auto-sync-cron.log b/auto-sync-cron.log index f9c7bbdb..dda0e398 100644 --- a/auto-sync-cron.log +++ b/auto-sync-cron.log @@ -64210,3 +64210,6 @@ fatal: refusing to merge unrelated histories /bin/sh: ./management/sanguo_auto_sync/auto-sync.sh: No such file or directory /bin/sh: ./management/sanguo_auto_sync/auto-sync.sh: No such file or directory /bin/sh: ./management/sanguo_auto_sync/auto-sync.sh: No such file or directory +/bin/sh: ./management/sanguo_auto_sync/auto-sync.sh: No such file or directory +/bin/sh: ./management/sanguo_auto_sync/auto-sync.sh: No such file or directory +/bin/sh: ./management/sanguo_auto_sync/auto-sync.sh: No such file or directory diff --git a/docker/Dockerfile b/docker/Dockerfile index 6a681dc6..927b3989 100755 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -56,7 +56,11 @@ RUN pip install --no-cache-dir -r requirements-base.txt COPY docker/requirements/requirements-extra.txt . RUN pip install --no-cache-dir -r requirements-extra.txt -RUN curl -fsSL https://code-server.dev/install.sh | sh +# 直接下载 code-server 二进制版本,更稳定 +RUN curl -fSL https://github.com/coder/code-server/releases/download/v4.96.1/code-server-4.96.1-linux-arm64.tar.gz | tar xz -C /tmp && \ + mv /tmp/code-server-4.96.1-linux-arm64/bin/code-server /usr/local/bin/ && \ + mv /tmp/code-server-4.96.1-linux-arm64/lib/code-server /usr/local/lib/ && \ + rm -rf /tmp/code-server-* RUN useradd -m -u 1000 vnpy && echo "vnpy ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers && mkdir -p /home/vnpy/.ssh && chown -R vnpy:vnpy /home/vnpy /app && chmod 700 /home/vnpy/.ssh diff --git a/logs/auto-sync.log b/logs/auto-sync.log index 6fb66a5e..12a6f48e 100644 --- a/logs/auto-sync.log +++ b/logs/auto-sync.log @@ -4,3 +4,5 @@ + +