From ea1a0771baa0a9e41d6c4c11f97b6a187a35c79d Mon Sep 17 00:00:00 2001
From: Deploy Bot <deploy@example.com>
Date: Thu, 17 Jul 2025 20:37:58 -0400
Subject: [PATCH] Fix container name resolution and improve SSH setup

---
 .github/workflows/test.yml | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a93d746..b3819bd 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -70,10 +70,25 @@ jobs:
         cat ~/.ssh/id_ed25519.pub | ssh-keyscan -p 2222 -t ed25519 localhost > /dev/null 2>&1 || true
         # Wait for Dokku to be ready
         echo "Waiting for Dokku to be ready..."
-        until docker exec dokku ps | grep -q sshd; do sleep 1; done
-        sleep 5
+        # Get the actual container ID
+        CONTAINER_ID=$(docker ps -qf "name=dokku")
+        echo "Dokku container ID: $CONTAINER_ID"
+        
+        # Wait for SSH to be ready
+        until docker exec $CONTAINER_ID ps | grep -q sshd; do 
+          echo "Waiting for SSH to be ready..."
+          sleep 2
+        done
+        
         # Add the key to the dokku user
-        cat ~/.ssh/id_ed25519.pub | ssh -p 2222 -o StrictHostKeyChecking=no dokku@localhost "mkdir -p ~/.ssh && cat >> ~/.ssh/authorized_keys && chmod 600 ~/.ssh/authorized_keys" || true
+        echo "Adding SSH key to dokku user..."
+        docker exec -i $CONTAINER_ID bash -c '
+          mkdir -p /home/dokku/.ssh
+          chmod 700 /home/dokku/.ssh
+          cat >> /home/dokku/.ssh/authorized_keys
+          chmod 600 /home/dokku/.ssh/authorized_keys
+          chown -R dokku:dokku /home/dokku/.ssh
+        ' < ~/.ssh/id_ed25519.pub || true
         
         # Test SSH connection
         echo "Testing SSH connection..."