diff --git a/.gitea/workflows/docker.yml b/.gitea/workflows/docker.yml index 8fee8e7..12ce66a 100644 --- a/.gitea/workflows/docker.yml +++ b/.gitea/workflows/docker.yml @@ -408,12 +408,12 @@ jobs: if: env.BUILD_TARGET == 'admin' || env.BUILD_TARGET == 'user' || env.BUILD_TARGET == 'both' uses: appleboy/ssh-action@v1.0.3 with: - host: ${{ secrets.HOST }} - username: ${{ secrets.USERNAME }} - key: ${{ secrets.KEY }} - port: ${{ secrets.PORT }} - timeout: 60s - command_timeout: 30s + host: ${{ env.SSH_HOST }} + username: ${{ env.SSH_USER }} + password: ${{ env.SSH_PASSWORD }} + port: ${{ env.SSH_PORT }} + timeout: 300s + command_timeout: 600s debug: true script: | echo "=== SSH连接测试 ===" @@ -428,22 +428,12 @@ jobs: if: env.BUILD_TARGET == 'admin' || env.BUILD_TARGET == 'both' uses: appleboy/ssh-action@v1.0.3 with: - host: ${{ secrets.HOST }} - username: ${{ secrets.USERNAME }} - key: ${{ secrets.KEY }} - port: ${{ secrets.PORT }} + host: ${{ env.SSH_HOST }} + username: ${{ env.SSH_USER }} + password: ${{ env.SSH_PASSWORD }} + port: ${{ env.SSH_PORT }} timeout: 300s command_timeout: 600s - debug: true - use_insecure_cipher: false - cipher: aes128-ctr,aes192-ctr,aes256-ctr,aes128-gcm@openssh.com,aes256-gcm@openssh.com - fingerprint: "" - proxy_host: "" - proxy_port: "" - proxy_username: "" - proxy_password: "" - proxy_timeout: 30s - proxy_use_insecure_cipher: false script: | echo "=== SSH变量调试信息 ===" echo "DOCKER_REGISTRY: ${{ env.DOCKER_REGISTRY }}" @@ -586,22 +576,13 @@ jobs: if: env.BUILD_TARGET == 'user' || env.BUILD_TARGET == 'both' uses: appleboy/ssh-action@v1.0.3 with: - host: ${{ secrets.HOST }} - username: ${{ secrets.USERNAME }} - key: ${{ secrets.KEY }} - port: ${{ secrets.PORT }} + host: ${{ env.SSH_HOST }} + username: ${{ env.SSH_USER }} + password: ${{ env.SSH_PASSWORD }} + port: ${{ env.SSH_PORT }} timeout: 300s command_timeout: 600s debug: true - use_insecure_cipher: false - cipher: aes128-ctr,aes192-ctr,aes256-ctr,aes128-gcm@openssh.com,aes256-gcm@openssh.com - fingerprint: "" - proxy_host: "" - proxy_port: "" - proxy_username: "" - proxy_password: "" - proxy_timeout: 30s - proxy_use_insecure_cipher: false script: | echo "=== SSH变量调试信息 ===" echo "DOCKER_REGISTRY: ${{ env.DOCKER_REGISTRY }}"