From 091e02ea554b0a5d98c0a45e2982d05d9df77735 Mon Sep 17 00:00:00 2001
From: ITQ <itq.dev@ya.ru>
Date: Wed, 2 Apr 2025 19:33:58 +0300
Subject: [PATCH] ci: fix

---
 .gitlab-ci.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7da3a63..68bb694 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -88,23 +88,23 @@ deploy:
   rules:
     - if: '$CI_COMMIT_REF_NAME == "master"'
   variables:
-    SSH_ADDRESS: "$SSH_USER@$SSH_HOST:$SSH_PORT"
+    SSH_ADDRESS: $SSH_USER@$SSH_HOST
     SSH_PRIVATE_KEY: SSH_PRIVATE_KEY
   script:
     - mkdir -p ~/.ssh
     - chmod 700 ~/.ssh
     - echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config
-    - echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa
+    - echo $SSH_PRIVATE_KEY > ~/.ssh/id_rsa
     - chmod 600 ~/.ssh/id_rsa
     - ssh-keyscan -H "$SSH_HOST" -p "$SSH_PORT" > /dev/null 2>&1
 
     - 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 "docker -v"
+    - ssh -p $SSH_PORT $SSH_ADDRESS "$AUTH_COMMAND"
+    - scp -P $SSH_PORT -C -r infrastructure/ compose.yaml $SSH_ADDRESS:~/deploy/
+    - ssh -p $SSH_PORT $SSH_ADDRESS "docker -v"
 
     - |
-      ssh $SSH_ADDRESS <<'EOF'
+      ssh -p $SSH_PORT $SSH_ADDRESS <<'EOF'
       cd ~/deploy
       docker system prune -a --force
       docker compose pull > deploy.log 2>&1