FIX add ports to ssh-keyscan

TapTap21 · Nov 2, 2020 · 25d2611 · 25d2611
1 parent d54b992
commit 25d2611
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/action.yml b/action.yml
@@ -32,7 +32,7 @@ inputs:
 
 runs:
   using: docker
-  image: docker://taptap21/docker-remote-deployment-action:v1.0
+  image: docker://taptap21/docker-remote-deployment-action:v1.1
 
 branding:
   icon: send

diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
@@ -59,16 +59,14 @@ ssh-add ~/.ssh/id_rsa
 
 
 echo "Add known hosts"
-#printf '%s %s\n' "$SSH_HOST" "$INPUT_SSH_PUBLIC_KEY" >> /etc/ssh/ssh_known_hosts
-ssh-keyscan "$SSH_HOST" >> ~/.ssh/known_hosts
-ssh-keyscan "$SSH_HOST" >> /etc/ssh/ssh_known_hosts
+ssh-keyscan -p $INPUT_SSH_PORT "$SSH_HOST" >> ~/.ssh/known_hosts
+ssh-keyscan -p $INPUT_SSH_PORT "$SSH_HOST" >> /etc/ssh/ssh_known_hosts
 # set context
 echo "Create docker context"
 docker context create staging --docker "host=ssh://$INPUT_REMOTE_DOCKER_HOST:$INPUT_SSH_PORT"
 docker context use staging
 
 
-docker ps
 if  [ -n "$INPUT_DOCKER_LOGIN_PASSWORD" ] || [ -n "$INPUT_DOCKER_LOGIN_USER" ] || [ -n "$INPUT_DOCKER_LOGIN_REGISTRY" ]; then
   echo "Connecting to $INPUT_REMOTE_DOCKER_HOST... Command: docker login"
   docker login -u "$INPUT_DOCKER_LOGIN_USER" -p "$INPUT_DOCKER_LOGIN_PASSWORD" "$INPUT_DOCKER_LOGIN_REGISTRY"