.drone.yml

@@ -44,11 +44,8 @@ steps:
       SSH_PRIVATE_KEY:
         from_secret: SSH_PRIVATE_KEY
     commands:
-      - export $SSH_TARGET="$SSH_USER@$SSH_HOST"
+      - echo $SSH_USER
-      - set -x
+      - echo $SSH_HOST
-      - echo "$SSH_TARGET"
-      - echo $SSH_USER | wc -c
-      - echo $SSH_HOST | wc -c
       - echo $SSH_PRIVATE_KEY
       - apk update && apk add openssh-client
       - mkdir -p ~/.ssh && chmod 700 ~/.ssh
@@ -56,13 +53,8 @@ steps:
       - chmod 600 ~/.ssh/deploy_key
       - ssh-keygen -f ~/.ssh/deploy_key -y > ~/.ssh/deploy_key.pub
       - "cat ~/.ssh/deploy_key.pub | cut -f3 -d' '"
-      - ssh -o StrictHostKeyChecking=no -i ~/.ssh/deploy_key $SSH_TARGET ps:stop social
+      - ssh -o StrictHostKeyChecking=no -i ~/.ssh/deploy_key "${SSH_USER}@${SSH_HOST}" ps:stop social
-      - ssh -o StrictHostKeyChecking=no
+      - ssh -o StrictHostKeyChecking=no -i ~/.ssh/deploy_key "${SSH_USER}@${SSH_HOST}" git:from-image social "glenux/service-gotosocial:${DRONE_BRANCH/\\//-}_${DRONE_COMMIT_SHA:0:8}"
-            -i ~/.ssh/deploy_key
-            $SSH_USER@$SSH_HOST
-            git:from-image social
-            "glenux/service-gotosocial:${DRONE_BRANCH/\\//-}_${DRONE_COMMIT_SHA:0:8}"
-      #
       - echo "SUCCESS"
 
 # volumes: