some

Author: Layko Andrey

.github/workflows/main.yml

@@ -151,23 +151,22 @@ jobs:
 
       - name: Setup SSH connection
         run: |
+          sudo apt install openssh-client
+          sudo curl -L "https://github.com/docker/compose/releases/download/1.27.4/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
           eval $(ssh-agent -s)
-          echo "${{ secrets.SPRINT_DEPLOY_SSH_KEY }}" > deploy_key
-          chmod 600 ./deploy_key
+          echo "${{ secrets.SPRINT_DEPLOY_SSH_KEY }}" | tr -d '\r' | ssh-add - > /dev/null
           mkdir -p ~/.ssh
           chmod 700 ~/.ssh
           ssh-keyscan ${{ secrets.SPRINT_SERVER }} >> ~/.ssh/known_hosts
           chmod 644 ~/.ssh/known_hosts
 
       - name: Deploy server
         run: |
-          ssh -i ./deploy_key gitlab@${{ secrets.SPRINT_SERVER }} "
-            export MONGODB_PASSWORD="${{ secrets.SPRINT_MONGO_PASSWORD }}" && \
-            export DOCKER_IMAGE_TAG="openplatform/open-state:${{ env.IMAGE_TAG }}" && \
-            docker login -u ${{ secrets.DOCKERHUB_USER_NAME }} -p ${{ secrets.DOCKERHUB_PASSWORD }} && \
-            docker-compose -f docker-compose-server.yml up -d && \
-            docker image ls --filter reference=openplatform/open-state:${{ env.IMAGE_TAG }} -q | tail -n +4 | xargs --no-run-if-empty docker image rm
-          "
+          export MONGODB_PASSWORD="${{ secrets.SPRINT_MONGO_PASSWORD }}" && \
+          export DOCKER_IMAGE_TAG="openplatform/open-state:${{ env.IMAGE_TAG }}"
+          docker login -u ${{ secrets.DOCKERHUB_USER_NAME }} -p ${{ secrets.DOCKERHUB_PASSWORD }}
+          docker-compose -f docker-compose-server.yml up -d -host ssh://gitlab@${{ secrets.SPRINT_SERVER }}
+          docker image ls --filter reference=openplatform/open-state:${{ env.IMAGE_TAG }} -q | tail -n +4 | xargs --no-run-if-empty docker image rm
 
 
   deploy-production: