mirror of
https://github.com/appleboy/ssh-action.git
synced 2024-11-12 04:28:03 +00:00
Merge branch 'master' of github.com:appleboy/ssh-action into appleboy-master
This commit is contained in:
commit
332ff99a47
@ -1,4 +1,4 @@
|
||||
FROM ghcr.io/appleboy/drone-ssh:1.7.4
|
||||
FROM ghcr.io/appleboy/drone-ssh:1.7.7
|
||||
|
||||
COPY entrypoint.sh /bin/entrypoint.sh
|
||||
|
||||
|
19
README.md
19
README.md
@ -122,14 +122,29 @@ Copy Private Key content and paste in Github Secrets.
|
||||
|
||||
### Copy rsa Private key
|
||||
|
||||
Before copying the private key, install `clip` command as shown below:
|
||||
|
||||
```bash
|
||||
clip < ~/.ssh/id_rsa
|
||||
# Ubuntu
|
||||
sudo apt-get install xclip
|
||||
```
|
||||
|
||||
copy the private key:
|
||||
|
||||
```bash
|
||||
# macOS
|
||||
pbcopy < ~/.ssh/id_rsa
|
||||
# Ubuntu
|
||||
xclip < ~/.ssh/id_rsa
|
||||
```
|
||||
|
||||
### Copy ed25519 Private key
|
||||
|
||||
```bash
|
||||
clip < ~/.ssh/id_ed25519
|
||||
# macOS
|
||||
pbcopy < ~/.ssh/id_ed25519
|
||||
# Ubuntu
|
||||
xclip < ~/.ssh/id_ed25519
|
||||
```
|
||||
|
||||
See the detail information about [SSH login without password](http://www.linuxproblem.org/art_9.html).
|
||||
|
@ -8,7 +8,7 @@ export GITHUB="true"
|
||||
|
||||
GITHUB_ACTION_PATH="${GITHUB_ACTION_PATH%/}"
|
||||
DRONE_SSH_RELEASE_URL="${DRONE_SSH_RELEASE_URL:-https://github.com/appleboy/drone-ssh/releases/download}"
|
||||
DRONE_SSH_VERSION="${DRONE_SSH_VERSION:-1.7.4}"
|
||||
DRONE_SSH_VERSION="${DRONE_SSH_VERSION:-1.7.7}"
|
||||
|
||||
function detect_client_info() {
|
||||
if [ -n "${SSH_CLIENT_OS-}" ]; then
|
||||
@ -61,11 +61,14 @@ DOWNLOAD_URL_PREFIX="${DRONE_SSH_RELEASE_URL}/v${DRONE_SSH_VERSION}"
|
||||
CLIENT_BINARY="drone-ssh-${DRONE_SSH_VERSION}-${CLIENT_PLATFORM}-${CLIENT_ARCH}"
|
||||
TARGET="${GITHUB_ACTION_PATH}/${CLIENT_BINARY}"
|
||||
echo "Will download ${CLIENT_BINARY} from ${DOWNLOAD_URL_PREFIX}"
|
||||
curl -fL --retry 3 --keepalive-time 2 "${DOWNLOAD_URL_PREFIX}/${CLIENT_BINARY}" -o ${TARGET}
|
||||
curl -fsSL --retry 5 --keepalive-time 2 "${DOWNLOAD_URL_PREFIX}/${CLIENT_BINARY}" -o ${TARGET}
|
||||
chmod +x ${TARGET}
|
||||
|
||||
echo "======= CLI Version ======="
|
||||
sh -c "${TARGET} --version" # print version
|
||||
echo "==========================="
|
||||
{
|
||||
sh -c "${TARGET} $*"
|
||||
sh -c "${TARGET} $*" # run the command
|
||||
} 2> /tmp/errFile | tee /tmp/outFile
|
||||
|
||||
stdout=$(cat /tmp/outFile)
|
||||
|
Loading…
Reference in New Issue
Block a user