m5x2 #2

Merged
smf merged 32 commits from m5x2 into local 2024-03-08 18:15:54 +08:00
Showing only changes of commit cbfb477c9a - Show all commits

View File

@@ -43,9 +43,6 @@ if [ -z "${INPUT_DOCKER_REGISTRY_URI+x}" ]; then
INPUT_DOCKER_REGISTRY_URI=https://registry.hub.docker.com INPUT_DOCKER_REGISTRY_URI=https://registry.hub.docker.com
fi fi
USER_AT_HOST="$INPUT_REMOTE_DOCKER_USER@$INPUT_REMOTE_DOCKER_HOST"
SSH_HOST=${USER_AT_HOST#*@}
echo "Registering SSH keys..." echo "Registering SSH keys..."
# register the private key with the agent. # register the private key with the agent.
@@ -60,8 +57,8 @@ eval $(ssh-agent)
ssh-add ~/.ssh/id_rsa ssh-add ~/.ssh/id_rsa
echo "Add known hosts" echo "Add known hosts"
ssh-keyscan -p $INPUT_REMOTE_DOCKER_PORT "$SSH_HOST" >> ~/.ssh/known_hosts # ssh-keyscan -p $INPUT_REMOTE_DOCKER_PORT "$INPUT_REMOTE_DOCKER_HOST" >> ~/.ssh/known_hosts
ssh-keyscan -p $INPUT_REMOTE_DOCKER_PORT "$SSH_HOST" >> /etc/ssh/ssh_known_hosts # ssh-keyscan -p $INPUT_REMOTE_DOCKER_PORT "$INPUT_REMOTE_DOCKER_HOST" >> /etc/ssh/ssh_known_hosts
echo "Add REMOTE_DOCKER_HOST alias to ~/.ssh/config" echo "Add REMOTE_DOCKER_HOST alias to ~/.ssh/config"
touch ~/.ssh/config touch ~/.ssh/config
@@ -78,9 +75,6 @@ fi
echo >> ~/.ssh/config echo >> ~/.ssh/config
chmod 600 ~/.ssh/config chmod 600 ~/.ssh/config
cat ~/.ssh/id_rsa
cat ~/.ssh/config
echo "docker -v" echo "docker -v"
echo `docker -v` echo `docker -v`
echo "docker-compose -v" echo "docker-compose -v"