diff --git a/api/Dockerfile b/api/Dockerfile index ebe1efe..0233f8b 100644 --- a/api/Dockerfile +++ b/api/Dockerfile @@ -27,7 +27,15 @@ COPY requirements.txt ./ RUN pip install --no-cache-dir --retries "${PIP_RETRIES}" --timeout "${PIP_DEFAULT_TIMEOUT}" -i "${PIP_INDEX_URL}" -r requirements.txt RUN python -c "import rasterio; print('rasterio ready:', rasterio.__version__)" +# Static assets (tpbig.exe, etc.) +COPY static/ /app/static/ + +# Entrypoint: ensures tpbig.exe is available in runtime volume +COPY docker-entrypoint.sh /docker-entrypoint.sh +RUN chmod +x /docker-entrypoint.sh + COPY app ./app EXPOSE 8000 +ENTRYPOINT ["/docker-entrypoint.sh"] CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000", "--ws", "wsproto"] diff --git a/api/docker-entrypoint.sh b/api/docker-entrypoint.sh new file mode 100755 index 0000000..46c4954 --- /dev/null +++ b/api/docker-entrypoint.sh @@ -0,0 +1,41 @@ +#!/bin/bash +set -e + +# ============================================================ +# fquiz API Docker Entrypoint +# Ensures static assets (tpbig.exe) are available at runtime +# locations, even when the /app/data volume is a fresh bind mount. +# ============================================================ + +STATIC_ROOT="/app/static/wine" +DATA_ROOT="/app/data/wine" + +# --- tpbig.exe (Legacy ATP path: wine_allowed_root/ATP/tpbig.exe) --- +if [ -f "${STATIC_ROOT}/ATP/tpbig.exe" ]; then + mkdir -p "${DATA_ROOT}/ATP" + if [ ! -f "${DATA_ROOT}/ATP/tpbig.exe" ] || ! cmp -s "${STATIC_ROOT}/ATP/tpbig.exe" "${DATA_ROOT}/ATP/tpbig.exe"; then + cp "${STATIC_ROOT}/ATP/tpbig.exe" "${DATA_ROOT}/ATP/tpbig.exe" + echo "entrypoint: initialized ${DATA_ROOT}/ATP/tpbig.exe" + fi +fi + +# --- tpbig.exe (atp-storage path: used by atp_engine_executable) --- +if [ -f "${STATIC_ROOT}/atp/tpbig.exe" ]; then + mkdir -p "${DATA_ROOT}/atp" + if [ ! -f "${DATA_ROOT}/atp/tpbig.exe" ] || ! cmp -s "${STATIC_ROOT}/atp/tpbig.exe" "${DATA_ROOT}/atp/tpbig.exe"; then + cp "${STATIC_ROOT}/atp/tpbig.exe" "${DATA_ROOT}/atp/tpbig.exe" + echo "entrypoint: initialized ${DATA_ROOT}/atp/tpbig.exe" + fi +fi + +# --- tpbig.exe (atp-models storage: atp_storage_root) --- +if [ -f "${STATIC_ROOT}/ATP/tpbig.exe" ]; then + mkdir -p "${DATA_ROOT}/atp-models" + if [ ! -f "${DATA_ROOT}/atp-models/tpbig.exe" ] || ! cmp -s "${STATIC_ROOT}/ATP/tpbig.exe" "${DATA_ROOT}/atp-models/tpbig.exe"; then + cp "${STATIC_ROOT}/ATP/tpbig.exe" "${DATA_ROOT}/atp-models/tpbig.exe" + echo "entrypoint: initialized ${DATA_ROOT}/atp-models/tpbig.exe" + fi +fi + +# Execute the main container command +exec "$@" diff --git a/api/static/wine/ATP/tpbig.exe b/api/static/wine/ATP/tpbig.exe new file mode 100755 index 0000000..f4ede81 Binary files /dev/null and b/api/static/wine/ATP/tpbig.exe differ diff --git a/api/static/wine/atp/tpbig.exe b/api/static/wine/atp/tpbig.exe new file mode 100755 index 0000000..f4ede81 Binary files /dev/null and b/api/static/wine/atp/tpbig.exe differ