Skip to content

Commit

Permalink
Merge pull request #2 from GammaGames/appleboy-master
Browse files Browse the repository at this point in the history
Appleboy master
  • Loading branch information
GammaGames authored Jul 19, 2024
2 parents ec7832b + 332ff99 commit aed7361
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 6 deletions.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
19 changes: 17 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
# Ubuntu
sudo apt-get install xclip
```

copy the private key:

```bash
clip < ~/.ssh/id_rsa
# 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).
Expand Down
9 changes: 6 additions & 3 deletions entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit aed7361

Please sign in to comment.