From f3730a142780afbb3c48a75eac2257c6ae751100 Mon Sep 17 00:00:00 2001 From: Jon Ervine Date: Wed, 17 Feb 2021 22:09:19 +0800 Subject: [PATCH] Added shared key authentication option --- Jenkinsfile | 5 ++++- run.sh | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) mode change 100755 => 100644 run.sh diff --git a/Jenkinsfile b/Jenkinsfile index b0a1dd3..c2bc1fd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -27,9 +27,12 @@ spec: stage('Build with Kaniko') { git url: 'ssh://git@git.ervine.org/jonny/x86_64-alpine-wetty.git', credentialsId: 'jenkins-to-git' container('kaniko') { - sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=true --destination=harbor.ervine.dev/public/x86_64/alpine/wetty:1.3' + sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=true --destination=harbor.ervine.dev/public/x86_64/alpine/wetty:1.3.1' } } + stage('Notify gchat') { + hangoutsNotify message: "WeTTy on Alpine Linux has built",token: "A2ET831pVslqXTqAx6ycu573r",threadByJob: false + } } } diff --git a/run.sh b/run.sh old mode 100755 new mode 100644 index a50a2a5..e8950cd --- a/run.sh +++ b/run.sh @@ -9,7 +9,7 @@ if [ "x${REMOTE_SSH_SERVER}" == "x" ]; then npm start -- -p 3000 else # SSH connect mode - cmd="npm start -- -p 3000 --sshhost ${REMOTE_SSH_SERVER} --sshport ${REMOTE_SSH_PORT} --base ${BASE}" + cmd="npm start -- -p 3000 --sshhost ${REMOTE_SSH_SERVER} --sshport ${REMOTE_SSH_PORT} --sshauth ${SSH_AUTH} --base ${BASE}" if ! [ "x${REMOTE_SSH_USER}" == "x" ]; then cmd="${cmd} --sshuser ${REMOTE_SSH_USER}" fi