From 9b670600f69d795174b7316f69c49e4180bc3562 Mon Sep 17 00:00:00 2001 From: Your Name Date: Sun, 1 Jun 2025 11:37:39 +1200 Subject: [PATCH] 'Generic Commit' --- .gitea/workflows/testactions.yaml | 2 +- test.sh | 52 ++++++++++++++++++++++++------- 2 files changed, 42 insertions(+), 12 deletions(-) diff --git a/.gitea/workflows/testactions.yaml b/.gitea/workflows/testactions.yaml index 91434ab..267aeaa 100644 --- a/.gitea/workflows/testactions.yaml +++ b/.gitea/workflows/testactions.yaml @@ -21,4 +21,4 @@ jobs: password: ${{ secrets.DOCKER_PUSH_TOKEN }} - name: Test run: | - HOST_WORKSPACE_PATH="${{ github.workspace }}" ./test.sh + ./test.sh diff --git a/test.sh b/test.sh index 4b87894..40dfe9c 100755 --- a/test.sh +++ b/test.sh @@ -5,12 +5,12 @@ set -euo pipefail SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" HOST_WORKSPACE_PATH="${HOST_WORKSPACE_PATH:-$(pwd)}" - echo "--------------------------------" echo "PWD: $(pwd)" echo "SCRIPT_DIR: $SCRIPT_DIR" echo "GITHUB_WORKSPACE: ${GITHUB_WORKSPACE:-not set}" echo "HOST_WORKSPACE_PATH: $HOST_WORKSPACE_PATH" +echo "JOB_CONTAINER_NAME: ${JOB_CONTAINER_NAME:-not set}" echo "--------------------------------" echo "--------------------------------" echo "--------------------------------" @@ -19,21 +19,50 @@ docker info | grep -E "(Docker Root Dir|Storage Driver)" || true echo "Mount info:" mount | grep -E "(overlay|workspace)" || true - echo "--------------------------------" echo "--------------------------------" echo "--------------------------------" echo "ls on host" ls -la ./ -echo "--------------------------------" -echo "ls -la ./" -docker run --rm -i --entrypoint /bin/bash -v ./:/workspace debian:latest -c "ls -la /workspace" -echo "--------------------------------" -echo "ls -la \$PWD" -docker run --rm -i --entrypoint /bin/bash -v "$PWD:/workspace" debian:latest -c "ls -la /workspace" -echo "--------------------------------" -echo "ls -la \$SCRIPT_DIR" -docker run --rm -i --entrypoint /bin/bash -v "$SCRIPT_DIR:/workspace" debian:latest -c "ls -la /workspace" + +# Check if we're running in Gitea Actions +if [ -n "${JOB_CONTAINER_NAME:-}" ]; then + echo "--------------------------------" + echo "Running in Gitea Actions - using --volumes-from" + echo "--------------------------------" + + echo "ls -la using --volumes-from" + docker run --rm -i --entrypoint /bin/bash \ + --volumes-from="${JOB_CONTAINER_NAME}" \ + debian:latest -c "cd ${GITHUB_WORKSPACE} && ls -la" + + echo "--------------------------------" + echo "Test file creation and reading" + echo "Creating test file in action container..." + echo "This is a test file from Gitea Actions" > test-file.txt + + echo "Reading test file from Docker container..." + docker run --rm -i --entrypoint /bin/bash \ + --volumes-from="${JOB_CONTAINER_NAME}" \ + debian:latest -c "cd ${GITHUB_WORKSPACE} && cat test-file.txt" + + # Clean up + rm -f test-file.txt +else + echo "--------------------------------" + echo "Running locally - using direct volume mounts" + echo "--------------------------------" + + echo "ls -la ./" + docker run --rm -i --entrypoint /bin/bash -v ./:/workspace debian:latest -c "ls -la /workspace" + echo "--------------------------------" + echo "ls -la \$PWD" + docker run --rm -i --entrypoint /bin/bash -v "$PWD:/workspace" debian:latest -c "ls -la /workspace" + echo "--------------------------------" + echo "ls -la \$SCRIPT_DIR" + docker run --rm -i --entrypoint /bin/bash -v "$SCRIPT_DIR:/workspace" debian:latest -c "ls -la /workspace" +fi + echo "--------------------------------" MOUNT_DIR="$SCRIPT_DIR" @@ -49,3 +78,4 @@ echo "ls -la \$MOUNT_DIR" docker run --rm -i --entrypoint /bin/bash -v "$MOUNT_DIR:/workspace" debian:latest -c "ls -la /workspace" echo "--------------------------------" +