diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile index e3a0c59..3d192e8 100644 --- a/jenkins/Jenkinsfile +++ b/jenkins/Jenkinsfile @@ -59,7 +59,7 @@ pipeline { sshCommand remote: remote, command: "cd ws_bucket && rm -rf ws_bucket deploy.sh" sshPut remote: remote, from: 'ws_bucket', into: 'ws_bucket/ws_bucket' sshPut remote: remote, from: 'jenkins/deploy.sh', into: 'ws_bucket/' - sshCommand remote: remote, command: 'chmod +x ws_bucket/deploy.sh ./ws_bucket/deploy.sh' + sshCommand remote: remote, command: 'chmod +x ws_bucket/deploy.sh && ws_bucket/deploy.sh' } } } diff --git a/jenkins/deploy.sh b/jenkins/deploy.sh index 9f4cfae..423a77d 100755 --- a/jenkins/deploy.sh +++ b/jenkins/deploy.sh @@ -4,6 +4,6 @@ export WSBROOT="ws_bucket" screen -S ws_bucket -X quit echo "starting ws_bucket" -screen -S ws_bucket -d -m bash -c "cd ${WSBROOT} && chmod +x ws_bucket && export WS_BUCKET_SECRET=${WS_BUCKET_SECRET} && ./ws_bucket" +screen -S ws_bucket -d -m bash -c "cd ${WSBROOT} && chmod +x ws_bucket && source ~/.bashrc && ./ws_bucket" sleep 1 screen -list