.drone.yml

@@ -44,22 +44,20 @@ steps:
       SSH_PRIVATE_KEY:
         from_secret: SSH_PRIVATE_KEY
     commands:
-      - export SSH_TARGET="$SSH_USER@$SSH_HOST"
-      - set -x
-      - echo "$SSH_TARGET"
-      - echo $SSH_USER | wc -c
-      - echo $SSH_HOST | wc -c
+      - echo $SSH_USER
+      - echo $SSH_HOST
       - echo $SSH_PRIVATE_KEY
       - apk update && apk add openssh-client
       - mkdir -p ~/.ssh && chmod 700 ~/.ssh
       - echo "$SSH_PRIVATE_KEY" | base64 -d > ~/.ssh/deploy_key
       - 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
+            "$SSH_USER@$SSH_HOST"
+            ps:stop social
+      - 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}"
             #

Dockerfile

@@ -3,8 +3,5 @@
 # FROM superseriousbusiness/gotosocial:0.13.1
 # FROM superseriousbusiness/gotosocial:0.14.2
 # FROM superseriousbusiness/gotosocial:0.15.0
-# FROM superseriousbusiness/gotosocial:0.16.0
+FROM superseriousbusiness/gotosocial:0.16.0
 # FROM superseriousbusiness/gotosocial:0.17.0
-# FROM superseriousbusiness/gotosocial:0.17.4
-# FROM superseriousbusiness/gotosocial:0.18.0
-FROM superseriousbusiness/gotosocial:0.18.3