This commit is contained in:
@ -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"
|
||||
|
Reference in New Issue
Block a user