Update Dockerfile

Dockerfile

@@ -5,13 +5,13 @@ ENV DEBIAN_FRONTEND=noninteractive
 
 # System deps for Blender GUI-less rendering + runtime fetch tools
 RUN apt-get update && apt-get install -y --no-install-recommends \
-    ca-certificates wget curl bzip2 xz-utils rsync git \
+    ca-certificates wget curl bzip2 xz-utils git rsync \
     libglib2.0-0 libx11-6 libxi6 libxxf86vm1 libxrender1 libxfixes3 \
     libxkbcommon0 libxrandr2 libasound2 libxinerama1 libsm6 libice6 \
     libgl1 libegl1 libglu1-mesa libdbus-1-3 libxcb1 \
  && rm -rf /var/lib/apt/lists/*
 
-# Grab a local copy of model-viewer so we can inline it (no external script loads)
+# Local copy of model-viewer (no external loads at runtime)
 RUN mkdir -p /app/static && \
     wget -q -O /app/static/model-viewer.min.js \
       https://unpkg.com/@google/model-viewer/dist/model-viewer.min.js
@@ -24,55 +24,37 @@ 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 (render.py imports PIL inside Blender)
+# Pillow inside Blender's embedded Python (some scripts import PIL there)
 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
 
-# -------- Python deps (base) --------
-WORKDIR /app
-COPY requirements.txt /app/requirements.txt
-RUN pip install --no-cache-dir -r requirements.txt
+# -------- Working dir where repo will be extracted --------
+WORKDIR /srv/app
 
-# -------- Fallback App code (used only if GIT_TOKEN/GIT_REPO not set) --------
-COPY app.py render.py /app/
-
-# -------- Runtime bootstrap to pull private repo safely (no heredoc; robust on HF) --------
+# -------- Startup script that downloads your PRIVATE GitHub repo and runs app.py --------
 # Expects Space settings:
-#   Secret:   GIT_TOKEN
-#   Variable: GIT_REPO   (e.g. owner/private-repo)
-#   Variable: GIT_REF    (optional, default "main")
-#   Variable: GIT_SUBDIR (optional, if app.py not at repo root)
+#   Secret:   GIT_TOKEN            (GitHub PAT with repo read access)
+#   Variable: GIT_REPO             (e.g. chaous/render)
+#   Variable: GIT_REF   (optional, default "main"; branch/tag/commit)
+#   Variable: GIT_SUBDIR(optional, if app.py is not at repo root)
 RUN printf '%s\n' \
 '#!/usr/bin/env bash' \
 'set -euo pipefail' \
 '' \
 'export BLENDER_BIN="${BLENDER_BIN:-blender}"' \
-'' \
 'TARGET_ROOT="/srv/app"' \
-'mkdir -p "$TARGET_ROOT"' \
-'' \
 'REPO="${GIT_REPO:-}"' \
 'REF="${GIT_REF:-main}"' \
 'SUBDIR="${GIT_SUBDIR:-}"' \
 '' \
-'use_bundled_fallback() {' \
-'  echo "[info] Using bundled /app fallback (no private repo configured or fetch failed)."' \
-'  rsync -a /app/ "${TARGET_ROOT}/"' \
-'  cd "${TARGET_ROOT}"' \
-'  exec python app.py' \
-'}' \
-'' \
-'if [[ -z "${REPO}" ]] || [[ -z "${GIT_TOKEN:-}" ]]; then' \
-'  use_bundled_fallback' \
+'if [[ -z "${REPO}" || -z "${GIT_TOKEN:-}" ]]; then' \
+'  echo "[error] GIT_REPO and GIT_TOKEN must be set in Space settings." >&2' \
+'  exit 1' \
 'fi' \
 '' \
-'echo "[info] Downloading ${REPO}@${REF} tarball from GitHub..."' \
+'echo "[info] Fetching ${REPO}@${REF}..."' \
 'ARCHIVE_URL="https://api.github.com/repos/${REPO}/tarball/${REF}"' \
-'' \
-'if ! wget -q --header="Authorization: Bearer ${GIT_TOKEN}" -O /tmp/repo.tar.gz "${ARCHIVE_URL}"; then' \
-'  echo "[warn] Download failed; falling back to bundled app."' \
-'  use_bundled_fallback' \
-'fi' \
+'wget -q --header="Authorization: Bearer ${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' \
@@ -80,30 +62,32 @@ RUN printf '%s\n' \
 '' \
 'if [[ -n "${SUBDIR}" ]]; then' \
 '  if [[ -d "${TARGET_ROOT}/${SUBDIR}" ]]; then' \
-'    TARGET_ROOT="${TARGET_ROOT}/${SUBDIR}"' \
+'    cd "${TARGET_ROOT}/${SUBDIR}"' \
 '  else' \
-'    echo "[warn] GIT_SUBDIR=${SUBDIR} not found; continuing from repo root."' \
+'    echo "[warn] GIT_SUBDIR=${SUBDIR} not found; using repo root."' \
+'    cd "${TARGET_ROOT}"' \
 '  fi' \
+'else' \
+'  cd "${TARGET_ROOT}"' \
 'fi' \
 '' \
-'if [[ -f "${TARGET_ROOT}/requirements.txt" ]]; then' \
+'if [[ -f requirements.txt ]]; then' \
 '  echo "[info] Installing repo requirements..."' \
-'  pip install --no-cache-dir -r "${TARGET_ROOT}/requirements.txt"' \
+'  pip install --no-cache-dir -r requirements.txt' \
 'fi' \
 '' \
-'cd "${TARGET_ROOT}"' \
-'' \
-'if [[ ! -f "app.py" ]]; then' \
-'  echo "[warn] app.py not found in repo path; falling back to bundled app."' \
-'  use_bundled_fallback' \
+'if [[ ! -f app.py ]]; then' \
+'  echo "[error] app.py not found in repo path." >&2' \
+'  ls -la' \
+'  exit 1' \
 'fi' \
 '' \
-'echo "[info] Starting app from private repo..."' \
+'echo "[info] Starting app.py..."' \
 'exec python app.py' \
 > /usr/local/bin/start.sh \
  && chmod +x /usr/local/bin/start.sh
 
-# Hugging Face Spaces env
+# -------- HF Space runtime env --------
 ENV PORT=7860 \
     GRADIO_SERVER_NAME=0.0.0.0 \
     GRADIO_SERVER_PORT=7860 \