From 595d97efed7e55562acde58ca8a9e52c36b942c4 Mon Sep 17 00:00:00 2001
From: Your Name <j@842.be>
Date: Sun, 1 Jun 2025 10:12:02 +1200
Subject: [PATCH] 'Generic Commit'

---
 .gitea/workflows/dropshell-build.yaml | 11 ++++++++++-
 dropshell-build/src/dropshell-build   | 19 ++++++++++++++++---
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/.gitea/workflows/dropshell-build.yaml b/.gitea/workflows/dropshell-build.yaml
index 6afc4a1..e990ce4 100644
--- a/.gitea/workflows/dropshell-build.yaml
+++ b/.gitea/workflows/dropshell-build.yaml
@@ -22,9 +22,18 @@ jobs:
       - name: Build
         run: |
           ./dropshell-build/build.sh
+      - name: Debug Docker Environment
+        run: |
+          echo "PWD: $(pwd)"
+          echo "GITHUB_WORKSPACE: ${GITHUB_WORKSPACE:-not set}"
+          echo "Runner workspace: ${{ github.workspace }}"
+          echo "Docker info:"
+          docker info | grep -E "(Docker Root Dir|Storage Driver)" || true
+          echo "Mount info:"
+          mount | grep -E "(overlay|workspace)" || true
       - name: Test
         run: |
-          ./dropshell-build/test.sh
+          HOST_WORKSPACE_PATH="${{ github.workspace }}" ./dropshell-build/test.sh
       - name: Publish
         run: |
           SOS_WRITE_TOKEN=${{ secrets.SOS_WRITE_TOKEN }} ./dropshell-build/publish.sh
diff --git a/dropshell-build/src/dropshell-build b/dropshell-build/src/dropshell-build
index 393c7b9..193650e 100755
--- a/dropshell-build/src/dropshell-build
+++ b/dropshell-build/src/dropshell-build
@@ -213,13 +213,26 @@ function buildspawn() {
         fi
         echo "Using Docker Buildchain."
         TAG="latest"
-        if [ -n "$DROPSHELL_BUILD_TAG" ]; then
-            TAG=":$DROPSHELL_BUILD_TAG"
+        if [ -n "${DROPSHELL_BUILD_TAG-}" ]; then
+            TAG="$DROPSHELL_BUILD_TAG"
         fi
         echo "Using Docker Buildchain with tag: $TAG"
+        
+        # Handle Docker-in-Docker path mapping for Gitea Actions.
+        MOUNT_DIR="$BUILD_DIR"
+        if [ -n "${HOST_WORKSPACE_PATH-}" ]; then
+            # Convert container path to host path
+            # Gitea typically mounts workspace at /workspace in the container
+            # Replace /workspace with the actual host path
+            MOUNT_DIR=$(echo "$BUILD_DIR" | sed "s|^/workspace|$HOST_WORKSPACE_PATH|")
+            if [ "$MOUNT_DIR" != "$BUILD_DIR" ]; then
+                echo "Docker-in-Docker: Mapping $BUILD_DIR to $MOUNT_DIR"
+            fi
+        fi
+        
         docker run --rm \
             -u "$(id -u)":"$(id -g)" \
-            -v "$BUILD_DIR":/app \
+            -v "$MOUNT_DIR":/app \
             "gitea.jde.nz/public/dropshell-build:${TAG}"
     else    
         echo "Using local native buildchain"