From 5aeebeca67e344a4da6a78e6d249f6a1a0ee1734 Mon Sep 17 00:00:00 2001 From: Glenn Date: Mon, 17 Mar 2025 14:37:19 +0100 Subject: [PATCH 1/3] ci: fix quotes again --- .drone.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 8f01c9a..5f4093f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -44,6 +44,9 @@ 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 - echo $SSH_HOST - echo $SSH_PRIVATE_KEY @@ -53,8 +56,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_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}" + - ssh -o StrictHostKeyChecking=no -i ~/.ssh/deploy_key $SSH_TARGET ps:stop social + - ssh -o StrictHostKeyChecking=no -i ~/.ssh/deploy_key $SSH_TARGET git:from-image social "glenux/service-gotosocial:${DRONE_BRANCH/\\//-}_${DRONE_COMMIT_SHA:0:8}" - echo "SUCCESS" # volumes: -- 2.45.3 From 113b5e14353f7cbc26785b1c0f0c72fc4b9f288f Mon Sep 17 00:00:00 2001 From: Glenn Date: Mon, 17 Mar 2025 17:08:48 +0100 Subject: [PATCH 2/3] ci: fix quotes again --- .drone.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 5f4093f..c8c096c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -57,7 +57,12 @@ steps: - 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_TARGET git:from-image social "glenux/service-gotosocial:${DRONE_BRANCH/\\//-}_${DRONE_COMMIT_SHA:0:8}" + - 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}" + # - echo "SUCCESS" # volumes: -- 2.45.3 From cd9ef122392f1b43c2dc1544eb48c2f44b25433a Mon Sep 17 00:00:00 2001 From: Glenn Date: Mon, 17 Mar 2025 18:12:00 +0100 Subject: [PATCH 3/3] ci: fix quotes again --- .drone.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index c8c096c..1e0503d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -47,8 +47,8 @@ steps: - export $SSH_TARGET="$SSH_USER@$SSH_HOST" - set -x - echo "$SSH_TARGET" - - echo $SSH_USER - - echo $SSH_HOST + - 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 @@ -59,7 +59,7 @@ steps: - 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 git:from-image social "glenux/service-gotosocial:${DRONE_BRANCH/\\//-}_${DRONE_COMMIT_SHA:0:8}" # -- 2.45.3