diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f454300..f6657dd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -49,7 +49,7 @@ build_backend-staticfiles: IMAGE_NAME: "$CI_REGISTRY_IMAGE/backend-staticfiles" deploy: - image: alpine:latest + image: kroniak/ssh-client:3.19 stage: deploy rules: - if: '$CI_COMMIT_REF_NAME == "master"' @@ -58,16 +58,14 @@ deploy: SSH_USER: "ubuntu" SSH_ADDRESS: "$SSH_USER@$SSH_HOST" SSH_PRIVATE_KEY_BASE64: "$ENV_PRIVATE_KEY_BASE64" - before_script: - - apk add --no-cache openssh-client script: - - echo $SSH_PRIVATE_KEY_BASE64 - mkdir -p ~/.ssh && chmod 700 ~/.ssh - echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config && chmod 600 ~/.ssh/config - echo "$SSH_PRIVATE_KEY_BASE64" | base64 -d > ~/.ssh/id_rsa && chmod 400 ~/.ssh/id_rsa - - cat ~/.ssh/id_rsa - ssh-agent sh -c "ssh-add ~/.ssh/id_rsa" - ssh-keyscan -H "$SSH_HOST" + - AUTH_COMMAND="echo "$CI_REGISTRY_PASSWORD" | docker login $CI_REGISTRY --username $CI_REGISTRY_USER --password-stdin"; + - ssh $SSH_ADDRESS "$AUTH_COMMAND" - scp -C -r infrastructure/ compose.yaml "$SSH_ADDRESS":~/deploy/ - ssh "$SSH_ADDRESS" << 'EOF' set -e