From ca150dc6a629e9f405377de94a61f380a6f5ca03 Mon Sep 17 00:00:00 2001
From: whyour <imwhyour@gmail.com>
Date: Mon, 22 May 2023 20:20:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20docker-compose=20=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/services/sshKey.ts   | 4 +++-
 docker/docker-compose.yml | 8 +++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/back/services/sshKey.ts b/back/services/sshKey.ts
index ec717dae..feb72693 100644
--- a/back/services/sshKey.ts
+++ b/back/services/sshKey.ts
@@ -60,7 +60,9 @@ export default class SshKeyService {
     if (host === 'github.com') {
       host = `ssh.github.com\n    Port 443\n    HostkeyAlgorithms +ssh-rsa\n    PubkeyAcceptedAlgorithms +ssh-rsa`;
     }
-    const proxyStr = proxy ? `    ProxyCommand nc -v -x ${proxy} %h %p\n` : '';
+    const proxyStr = proxy
+      ? `    ProxyCommand nc -v -x ${proxy} %h %p 2>/dev/null\n`
+      : '';
     const config = `Host ${alias}\n    Hostname ${host}\n    IdentityFile ${path.join(
       this.sshPath,
       alias,
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index ba8bfd78..46155afe 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -1,14 +1,12 @@
 version: '2'
 services:
   web:
+    # alpine 基础镜像版本
     image: whyour/qinglong:latest
+    # debian-slim 基础镜像版本
+    # image: whyour/qinglong:debian  
     volumes:
       - ./data:/ql/data
     ports:
       - "0.0.0.0:5700:5700"
     restart: unless-stopped
-    healthcheck:
-      test: ["CMD", "curl", "-sf", "http://127.0.0.1:5400/api/health", "||", "exit", "1"]
-      interval: 2m
-      timeout: 10s
-      retries: 3