diff --git a/ci/deploy/deploy-template.inc.yml b/ci/deploy/deploy-template.inc.yml index 41b42d1..6bf9112 100644 --- a/ci/deploy/deploy-template.inc.yml +++ b/ci/deploy/deploy-template.inc.yml @@ -8,7 +8,7 @@ - which ssh-agent || (apt-get update -y && apt-get install openssh-client -y) - eval $(ssh-agent -s) - mkdir -p ~/.ssh - - echo -n "$TECH_SSH_KEY" | tr -d '\r' > ~/.ssh/id_rsa + - echo -n "$TECH_SSH_KEY" | base64 -d > ~/.ssh/id_rsa - chmod 700 ~/.ssh - chmod 600 ~/.ssh/id_rsa # https://mikefarah.gitbook.io/yq/operators/traverse-read#nested-special-characters @@ -28,10 +28,11 @@ # - chmod 644 ~/.ssh/known_hosts - chmod -R 400 ~/.ssh script: + - cat ci/deploy/deploy.sh - > for stand in $STANDS; do echo -e "Connect to ${stand}..." && - scp -o StrictHostKeyChecking=no ci/deploy/deploy.sh "dorootless@${stand}:~/deploy.sh" && + scp -qi $TECH_SSH_KEY -o StrictHostKeyChecking=no ci/deploy/deploy.sh "dorootless@${stand}:~/deploy.sh" && ssh "dorootless@${stand}" "export CONTAINER_REGISTRY=$CONTAINER_REGISTRY && export PRODUCT=$PRODUCT && export PRODUCT_VERSION=$PRODUCT_VERSION &&