Prepare job build context

Dockerfile.base

@@ -1,7 +1,7 @@
 # Base image with FoundationPose dependencies split into CPU (L1) and GPU (L2)
 
 # Stage 1: CPU-only base with Python deps
-FROM ubuntu:22.04 AS foundationpose-base-l1
+FROM docker.io/ubuntu:22.04 AS foundationpose-base-l1
 
 ENV DEBIAN_FRONTEND=noninteractive
 
@@ -102,7 +102,7 @@ RUN pip install --no-cache-dir \
     && pip cache purge
 
 # Stage 2: GPU-enabled base
-FROM nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04 AS foundationpose-base-l2
+FROM docker.io/nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04 AS foundationpose-base-l2
 
 ENV DEBIAN_FRONTEND=noninteractive
 ENV CUDA_HOME=/usr/local/cuda

deploy.sh

@@ -41,6 +41,30 @@ if ! "${PY_BIN}" -c "import huggingface_hub" >/dev/null 2>&1; then
     "${PY_BIN}" -m pip install --quiet huggingface_hub
 fi
 
+# Initialize git repo if needed (for job context)
+if [ ! -d .git ]; then
+    echo "Initializing git repository..."
+    git init
+    git remote add origin "https://huggingface.co/spaces/${HF_SPACE}"
+    echo "✓ Git repository initialized"
+    echo ""
+fi
+
+# Commit local changes before job so the job can build the right ref
+if [[ -n $(git status -s) ]]; then
+    echo "Committing changes for job context..."
+    git add Dockerfile Dockerfile.base requirements.txt deploy.sh app.py client.py estimator.py masks.py scripts/run_hf_image_job.py download_weights.py
+    git commit -m "Prepare job build context"
+    echo "✓ Job context committed"
+fi
+
+# Push a temporary ref for the job to build from
+JOB_REF="job-build-$(date +%Y%m%d-%H%M%S)"
+echo "Pushing job ref: ${JOB_REF}"
+git push "https://huggingface.co/spaces/${HF_SPACE}" "HEAD:${JOB_REF}" --force
+echo "✓ Job ref pushed"
+echo ""
+
 echo "Stage 1: Building base image via HF Job"
 echo "Platform: ${PLATFORM}"
 echo "Image: ${IMAGE_NAME}:${TAG}"
@@ -53,7 +77,8 @@ JOB_OUTPUT=$("${PY_BIN}" scripts/run_hf_image_job.py \
     --dockerfile "Dockerfile.base" \
     --target "foundationpose-base-l2" \
     --flavor "l40sx1" \
-    --git-repo "https://huggingface.co/spaces/${HF_SPACE}" 2>&1 | tee /tmp/hf_image_job.log)
+    --git-repo "https://huggingface.co/spaces/${HF_SPACE}" \
+    --git-ref "${JOB_REF}" 2>&1 | tee /tmp/hf_image_job.log)
 
 JOB_ID=$(echo "${JOB_OUTPUT}" | awk '/Job ID:/ {print $3}')
 if [ -z "${JOB_ID}" ]; then
@@ -61,15 +86,55 @@ if [ -z "${JOB_ID}" ]; then
 else
     echo "Following job logs for 1 minute..."
     if [ -x "${HF_BIN}" ]; then
-        (timeout 60 "${HF_BIN}" jobs logs "${JOB_ID}") || true
+        HF_BIN_PATH="${HF_BIN}" JOB_ID="${JOB_ID}" "${PY_BIN}" - <<'PY'
+import os
+import subprocess
+import sys
+import time
+
+hf = os.environ["HF_BIN_PATH"]
+job_id = os.environ["JOB_ID"]
+
+proc = subprocess.Popen([hf, "jobs", "logs", job_id], stdout=sys.stdout, stderr=sys.stderr)
+try:
+    time.sleep(60)
+finally:
+    proc.terminate()
+    try:
+        proc.wait(timeout=5)
+    except Exception:
+        proc.kill()
+PY
         echo ""
         echo "Job status:"
-        "${HF_BIN}" jobs status "${JOB_ID}" || true
+        "${HF_BIN}" jobs inspect "${JOB_ID}" || true
     else
         echo "hf CLI not available; job logs skipped"
     fi
 fi
 
+if [ -n "${JOB_ID}" ] && [ -x "${HF_BIN}" ]; then
+    echo ""
+    echo "Waiting for image build job to complete..."
+    for i in $(seq 1 40); do
+        JOB_STAGE=$("${HF_BIN}" jobs inspect "${JOB_ID}" | python3 -c "import sys, json; data=json.load(sys.stdin)[0]; print(data.get('status', {}).get('stage', 'UNKNOWN'))" 2>/dev/null || echo "UNKNOWN")
+        echo "  Job stage: ${JOB_STAGE}"
+        case "${JOB_STAGE}" in
+            SUCCESS|SUCCEEDED|COMPLETED|DONE)
+                echo "✓ Image build job completed"
+                break
+                ;;
+            FAILED|ERROR|CANCELED|CANCELLED)
+                echo "✗ Image build job failed: ${JOB_STAGE}"
+                exit 1
+                ;;
+            *)
+                sleep 30
+                ;;
+        esac
+    done
+fi
+
 echo ""
 echo "Stage 2: Deploying to HuggingFace Space"
 echo ""

scripts/run_hf_image_job.py

@@ -49,6 +49,11 @@ def main() -> None:
         default="https://huggingface.co/spaces/gpue/foundationpose",
         help="Git repo to clone for build context (default: HF space repo)",
     )
+    parser.add_argument(
+        "--git-ref",
+        default="main",
+        help="Git ref (branch/tag/sha) to build from (default: main)",
+    )
     parser.add_argument(
         "--flavor",
         default="l40sx1",
@@ -94,6 +99,7 @@ def main() -> None:
         "CONTEXT": args.context,
         "TARGET": args.target,
         "GIT_REPO": args.git_repo,
+        "GIT_REF": args.git_ref,
         "DOCKER_USER": args.docker_user,
     }
     secrets = {
@@ -102,51 +108,46 @@ def main() -> None:
     }
 
     command = [
-        "sh",
-        "-c",
+        "bash",
+        "-lc",
         r"""
 set -euo pipefail
 
 echo "Installing git and certificates..."
-apk add --no-cache git ca-certificates curl >/dev/null
-
-# Start Docker daemon (DinD image)
-echo "Starting Docker daemon..."
-dockerd-entrypoint.sh > /tmp/dockerd.log 2>&1 &
-
-# Wait for Docker
-for i in $(seq 1 30); do
-  if docker info >/dev/null 2>&1; then
-    break
-  fi
-  sleep 1
-  if [ "$i" -eq 30 ]; then
-    echo "Docker did not start in time. Logs:" >&2
-    tail -n 200 /tmp/dockerd.log >&2 || true
-    exit 1
-  fi
-done
+if command -v microdnf >/dev/null 2>&1; then
+  microdnf install -y git ca-certificates tar gzip >/dev/null
+elif command -v dnf >/dev/null 2>&1; then
+  dnf install -y git ca-certificates tar gzip >/dev/null
+elif command -v apt-get >/dev/null 2>&1; then
+  apt-get update -qq && apt-get install -y -qq git ca-certificates tar gzip >/dev/null
+fi
 
 echo "Cloning build context..."
 if [ -n "${HF_TOKEN:-}" ]; then
   AUTH_REPO=$(echo "$GIT_REPO" | sed -e "s#https://#https://user:${HF_TOKEN}@#")
-  git clone --depth 1 "$AUTH_REPO" /work/repo
+  git clone --depth 1 --branch "$GIT_REF" "$AUTH_REPO" /work/repo
 else
-  git clone --depth 1 "$GIT_REPO" /work/repo
+  git clone --depth 1 --branch "$GIT_REF" "$GIT_REPO" /work/repo
 fi
 
 cd /work/repo
 
 echo "Logging in to Docker Hub..."
-echo "$DOCKER_TOKEN" | docker login -u "$DOCKER_USER" --password-stdin
+buildah login -u "$DOCKER_USER" -p "$DOCKER_TOKEN" docker.io
+
+export BUILDAH_ISOLATION=chroot
+export STORAGE_DRIVER=vfs
+
+PLATFORM_OS="${PLATFORM%%/*}"
+PLATFORM_ARCH="${PLATFORM##*/}"
 
 IMAGE_REF="$IMAGE_NAME:$IMAGE_TAG"
 
 echo "Building image $IMAGE_REF (target: $TARGET)..."
-docker build --platform "$PLATFORM" -f "$DOCKERFILE" --target "$TARGET" -t "$IMAGE_REF" "$CONTEXT"
+buildah bud --format docker --os "$PLATFORM_OS" --arch "$PLATFORM_ARCH" -f "$DOCKERFILE" --target "$TARGET" -t "$IMAGE_REF" "$CONTEXT"
 
 echo "Pushing image $IMAGE_REF..."
-docker push "$IMAGE_REF"
+buildah push "$IMAGE_REF" "docker://$IMAGE_REF"
 
 echo "✓ Image pushed successfully"
 """,
@@ -162,7 +163,7 @@ echo "✓ Image pushed successfully"
     print()
 
     job_info = run_job(
-        image="docker:24.0.7-dind",
+        image="quay.io/buildah/stable:latest",
         command=command,
         env=env,
         secrets=secrets,