Update Dockerfile

Dockerfile

@@ -24,19 +24,19 @@ RUN wget -q https://download.blender.org/release/Blender${BLENDER_MAJOR}/blender
  && rm blender-${BLENDER_VERSION}-linux-x64.tar.xz \
  && ln -s /opt/blender-${BLENDER_VERSION}-linux-x64/blender /usr/local/bin/blender
 
-# Pillow inside Blender's embedded Python (some scripts import PIL there)
+# Pillow inside Blender's embedded Python
 RUN /opt/blender-${BLENDER_VERSION}-linux-x64/${BLENDER_MAJOR}/python/bin/python3.11 -m ensurepip && \
     /opt/blender-${BLENDER_VERSION}-linux-x64/${BLENDER_MAJOR}/python/bin/python3.11 -m pip install --no-cache-dir Pillow
 
-# -------- Working dir where repo will be extracted --------
+# -------- Where the repo will live at runtime --------
 WORKDIR /srv/app
 
-# -------- Startup script: download private repo then run app.py --------
-# Required Space settings:
-#   Secret:   GIT_TOKEN                 (PAT with repo read access)
-#   Variable: GIT_REPO                  (e.g. chaous/render OR https://github.com/chaous/render.git)
-#   Variable: GIT_REF      (optional, default "main"; branch/tag/commit)
-#   Variable: GIT_SUBDIR   (optional, if app.py is not at repo root)
+# -------- Startup script: fetch private repo, install, run app.py --------
+# Space settings required:
+#   Secret:   GIT_TOKEN                       (PAT with repo read access)
+#   Variable: GIT_REPO                        (chaous/render OR https://github.com/chaous/render.git)
+#   Variable: GIT_REF      (optional, default "main")
+#   Variable: GIT_SUBDIR   (optional)
 RUN printf '%s\n' \
 '#!/usr/bin/env bash' \
 'set -euo pipefail' \
@@ -47,47 +47,57 @@ RUN printf '%s\n' \
 'REPO="${GIT_REPO:-}"' \
 'REF="${GIT_REF:-main}"' \
 'SUBDIR="${GIT_SUBDIR:-}"' \
+'UA="hf-space/1.0"' \
 '' \
 'if [[ -z "${REPO}" || -z "${GIT_TOKEN:-}" ]]; then' \
-'  echo "[error] GIT_REPO and GIT_TOKEN must be set in Space settings." >&2' \
-'  exit 1' \
+'  echo "[error] GIT_REPO and GIT_TOKEN must be set." >&2; exit 1' \
 'fi' \
 '' \
-'fetch_github_tarball() {' \
+'fetch_tarball() {' \
+'  # Args: owner name ref' \
 '  local owner="$1"; local name="$2"; local ref="$3"' \
-'  echo "[info] Downloading github.com/${owner}/${name}@${ref} tarball..."' \
-'  local ARCHIVE_URL="https://api.github.com/repos/${owner}/${name}/tarball/${ref}"' \
-'  wget -q --header="Authorization: token ${GIT_TOKEN}" -O /tmp/repo.tar.gz "${ARCHIVE_URL}"' \
-'  rm -rf "${TARGET_ROOT:?}/"*' \
-'  tar -xzf /tmp/repo.tar.gz -C "${TARGET_ROOT}" --strip-components=1' \
-'  rm -f /tmp/repo.tar.gz' \
+'  echo "[info] Trying codeload tarball ${owner}/${name}@${ref}..."' \
+'  local url1="https://codeload.github.com/${owner}/${name}/tar.gz/${ref}"' \
+'  if curl -fsSL -H "Authorization: Bearer ${GIT_TOKEN}" -H "User-Agent: ${UA}" -o /tmp/repo.tar.gz "$url1"; then' \
+'    return 0; fi' \
+'  echo "[warn] codeload failed; trying API tarball..."' \
+'  local url2="https://api.github.com/repos/${owner}/${name}/tarball/${ref}"' \
+'  if curl -fsSL -H "Authorization: Bearer ${GIT_TOKEN}" -H "User-Agent: ${UA}" -H "X-GitHub-Api-Version: 2022-11-28" -o /tmp/repo.tar.gz "$url2"; then' \
+'    return 0; fi' \
+'  return 1' \
 '}' \
 '' \
 'echo "[info] Fetching ${REPO}@${REF}..."' \
 'if [[ "${REPO}" == *"://"* ]]; then' \
 '  # URL form' \
 '  if [[ "${REPO}" == *"github.com"* ]]; then' \
-'    path="${REPO#*github.com/}"; path="${path%.git}"' \
-'    owner="${path%%/*}"; name="${path#*/}"; name="${name%%/*}"' \
-'    fetch_github_tarball "${owner}" "${name}" "${REF}"' \
+'    path="${REPO#*github.com/}"; path="${path%.git}"; owner="${path%%/*}"; name="${path#*/}"; name="${name%%/*}"' \
+'    if fetch_tarball "$owner" "$name" "$REF"; then' \
+'      rm -rf "${TARGET_ROOT:?}/"*; tar -xzf /tmp/repo.tar.gz -C "${TARGET_ROOT}" --strip-components=1; rm -f /tmp/repo.tar.gz' \
+'    else' \
+'      echo "[warn] Tarball failed; falling back to git clone..."' \
+'      rm -rf "${TARGET_ROOT:?}/"*' \
+'      git -c http.extraHeader="Authorization: Bearer ${GIT_TOKEN}" clone --depth 1 --branch "${REF}" "${REPO}" "${TARGET_ROOT}"' \
+'    fi' \
 '  else' \
-'    echo "[info] Non-GitHub host detected; using git clone."' \
+'    echo "[info] Non-GitHub host; using git clone."' \
 '    rm -rf "${TARGET_ROOT:?}/"*' \
 '    git -c http.extraHeader="Authorization: Bearer ${GIT_TOKEN}" clone --depth 1 --branch "${REF}" "${REPO}" "${TARGET_ROOT}"' \
 '  fi' \
 'else' \
 '  # owner/repo form' \
 '  owner="${REPO%%/*}"; name="${REPO#*/}"' \
-'  fetch_github_tarball "${owner}" "${name}" "${REF}"' \
-'fi' \
-'' \
-'if [[ -n "${SUBDIR}" ]]; then' \
-'  if [[ -d "${TARGET_ROOT}/${SUBDIR}" ]]; then' \
-'    cd "${TARGET_ROOT}/${SUBDIR}"' \
+'  if fetch_tarball "$owner" "$name" "$REF"; then' \
+'    rm -rf "${TARGET_ROOT:?}/"*; tar -xzf /tmp/repo.tar.gz -C "${TARGET_ROOT}" --strip-components=1; rm -f /tmp/repo.tar.gz' \
 '  else' \
-'    echo "[warn] GIT_SUBDIR=${SUBDIR} not found; using repo root."' \
-'    cd "${TARGET_ROOT}"' \
+'    echo "[warn] Tarball failed; falling back to git clone..."' \
+'    rm -rf "${TARGET_ROOT:?}/"*' \
+'    git -c http.extraHeader="Authorization: Bearer ${GIT_TOKEN}" clone --depth 1 --branch "${REF}" "https://github.com/${owner}/${name}.git" "${TARGET_ROOT}"' \
 '  fi' \
+'fi' \
+'' \
+'if [[ -n "${SUBDIR}" && -d "${TARGET_ROOT}/${SUBDIR}" ]]; then' \
+'  cd "${TARGET_ROOT}/${SUBDIR}"' \
 'else' \
 '  cd "${TARGET_ROOT}"' \
 'fi' \
@@ -98,9 +108,7 @@ RUN printf '%s\n' \
 'fi' \
 '' \
 'if [[ ! -f app.py ]]; then' \
-'  echo "[error] app.py not found in repo path." >&2' \
-'  ls -la' \
-'  exit 1' \
+'  echo "[error] app.py not found in repo path." >&2; ls -la; exit 1' \
 'fi' \
 '' \
 'echo "[info] Starting app.py..."' \