From 4489c33f6cc9e3c0c44ee1593ebc71ce6255bbfe Mon Sep 17 00:00:00 2001 From: smf Date: Thu, 7 Mar 2024 22:49:21 +0800 Subject: [PATCH] no check ssh key --- action.yml | 6 +++--- docker-entrypoint.sh | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/action.yml b/action.yml index 4693c52..5da1699 100644 --- a/action.yml +++ b/action.yml @@ -11,9 +11,9 @@ inputs: description: Remote Docker ssh port ie (22). required: false default: '22' - ssh_public_key: - description: Remote Docker SSH public key eg (~/.ssh/rsa_id.pub). - required: true + # ssh_public_key: + # description: Remote Docker SSH public key eg (~/.ssh/rsa_id.pub). + # required: true ssh_private_key: description: SSH private key used to connect to the docker host eg (~/.ssh/rsa_id). required: true diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 0a1722c..a222ae1 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -15,10 +15,10 @@ if [ -z "${INPUT_REMOTE_DOCKER_USER+x}" ]; then exit 1 fi -if [ -z "${INPUT_SSH_PUBLIC_KEY+x}" ]; then - echo "Input ssh_public_key is required!" - exit 1 -fi +# if [ -z "${INPUT_SSH_PUBLIC_KEY+x}" ]; then +# echo "Input ssh_public_key is required!" +# exit 1 +# fi if [ -z "${INPUT_SSH_PRIVATE_KEY+x}" ]; then echo "Input ssh_private_key is required!" @@ -50,13 +50,13 @@ mkdir -p ~/.ssh ls ~/.ssh printf '%s\n' "$INPUT_SSH_PRIVATE_KEY" > ~/.ssh/id_rsa chmod 600 ~/.ssh/id_rsa -printf '%s\n' "$INPUT_SSH_PUBLIC_KEY" > ~/.ssh/id_rsa.pub -chmod 600 ~/.ssh/id_rsa.pub +# printf '%s\n' "$INPUT_SSH_PUBLIC_KEY" > ~/.ssh/id_rsa.pub +# chmod 600 ~/.ssh/id_rsa.pub #chmod 600 "~/.ssh" eval $(ssh-agent) ssh-add ~/.ssh/id_rsa -echo "Add known hosts" +# echo "Add known hosts" # ssh-keyscan -p $INPUT_REMOTE_DOCKER_PORT "$INPUT_REMOTE_DOCKER_HOST" >> ~/.ssh/known_hosts # ssh-keyscan -p $INPUT_REMOTE_DOCKER_PORT "$INPUT_REMOTE_DOCKER_HOST" >> /etc/ssh/ssh_known_hosts @@ -77,16 +77,16 @@ fi echo >> ~/.ssh/config chmod 600 ~/.ssh/config -echo "docker -v" -echo `docker -v` -echo "docker-compose -v" -echo `docker-compose -v` +# echo "docker -v" +# echo `docker -v` +# echo "docker-compose -v" +# echo `docker-compose -v` set context echo "Create docker context" docker context create remote --docker "host=ssh://REMOTE_DOCKER_HOST" docker context use remote -sleep 1h +# sleep 1h if ! [ -z "${INPUT_DOCKER_REGISTRY_USERNAME+x}" ] && ! [ -z "${INPUT_DOCKER_REGISTRY_PASSWORD+x}" ]; then echo "Connecting to $INPUT_DOCKER_REGISTRY_URI... Command: docker login"