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