From 7413e9d6d205ac2b0a74429651949ca17521551b Mon Sep 17 00:00:00 2001 From: happybell80 Date: Mon, 7 Jul 2025 23:20:03 +0900 Subject: [PATCH] Fix Docker permission issues for admin user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Add Docker socket permission check - Implement fallback to sudo for docker commands - Handle admin user Docker access limitations - Add conditional logic for docker vs sudo docker-compose Resolves: Docker socket permission denied errors 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude --- .github/workflows/deploy.yml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index b72a8d0..64a8eb2 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -51,9 +51,22 @@ jobs: tar czf - . | ssh -p ${{ secrets.NAS_PORT }} admin@${{ secrets.NAS_HOST }} \ "cd /volume1/homes/admin/nginx-infra && tar xzf -" + - name: Check Docker permissions + run: | + ssh -p ${{ secrets.NAS_PORT }} admin@${{ secrets.NAS_HOST }} \ + "ls -la /var/run/docker.sock && groups" + - name: Remote docker-compose up run: | - ssh -p ${{ secrets.NAS_PORT }} ${{ secrets.NAS_USER }}@${{ secrets.NAS_HOST }} << 'EOF' + ssh -p ${{ secrets.NAS_PORT }} admin@${{ secrets.NAS_HOST }} << 'EOF' cd /volume1/homes/admin/nginx-infra - docker-compose up -d --build + + # Try with sudo if direct access fails + if ! docker ps > /dev/null 2>&1; then + echo "Using sudo for docker commands..." + sudo docker-compose up -d --build + else + echo "Direct docker access available..." + docker-compose up -d --build + fi EOF \ No newline at end of file