Update Dockerfile

Dockerfile

@@ -1,5 +1,7 @@
+# Используем тот же базовый образ, что и в примере
 FROM python:3.11-bookworm
 
+# 1. Установка системных зависимостей
 RUN apt-get update && apt-get install -y \
     wget unzip git build-essential pkg-config \
     libffi-dev libssl-dev zlib1g-dev ncurses-dev \
@@ -10,6 +12,7 @@ RUN apt-get update && apt-get install -y \
     patchelf zip \
     && rm -rf /var/lib/apt/lists/*
 
+# 2. Настройка переменных окружения для кросс-компиляции
 ENV WORK_DIR=/build
 ENV OUTPUT_DIR=/app/wheels
 ENV NDK_VERSION=r26b
@@ -23,9 +26,15 @@ ENV OPENSSL_VERSION=3.3.0
 ENV RUSTUP_HOME=/opt/rust
 ENV CARGO_HOME=/opt/rust
 ENV PATH=$PATH:/opt/rust/bin
+
+# Создаем рабочие директории
+RUN mkdir -p ${WORK_DIR} ${OUTPUT_DIR}
+
+# 3. Установка Rust (нужен для sqlmodel -> pydantic-core)
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain stable
 RUN rustup target add aarch64-linux-android
 
+# 4. Обновление pip и установка инструментов сборки
 RUN pip install --upgrade pip && \
     pip install --no-cache-dir \
     Cython wheel setuptools poetry-core hatchling \
@@ -34,11 +43,13 @@ RUN pip install --upgrade pip && \
 
 WORKDIR ${WORK_DIR}
 
+# 5. Скачивание и установка Android NDK
 RUN wget -q https://dl.google.com/android/repository/android-ndk-${NDK_VERSION}-linux.zip && \
     unzip -q android-ndk-${NDK_VERSION}-linux.zip && \
     mv android-ndk-${NDK_VERSION} ${NDK_HOME} && \
     rm android-ndk-${NDK_VERSION}-linux.zip
 
+# Настройка тулчейна NDK
 ENV TOOLCHAIN=${NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64
 ENV PATH=${TOOLCHAIN}/bin:$PATH
 ENV TARGET=${ANDROID_ARCH}-linux-android${ANDROID_API}
@@ -55,6 +66,7 @@ ENV CFLAGS="-target ${TARGET} -fPIC -D__ANDROID__"
 ENV CXXFLAGS="-target ${TARGET} -fPIC -D__ANDROID__"
 ENV LDFLAGS="-target ${TARGET} -fPIC"
 
+# 6. Сборка OpenSSL для Android (нужен для aiohttp/cryptography)
 WORKDIR ${WORK_DIR}
 RUN wget -q https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz && \
     tar -xf openssl-${OPENSSL_VERSION}.tar.gz
@@ -74,12 +86,14 @@ ENV OPENSSL_LIB_DIR=${OPENSSL_DIR}/lib64
 ENV OPENSSL_INCLUDE_DIR=${OPENSSL_DIR}/include
 ENV OPENSSL_STATIC=1
 
+# 7. Сборка Python для Android (чтобы получить libpython3.11.so)
 WORKDIR ${WORK_DIR}
 RUN wget -q https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tgz && \
     tar -xf Python-${PYTHON_VERSION}.tgz
 
 WORKDIR ${WORK_DIR}/Python-${PYTHON_VERSION}
 
+# Отключаем функции, которых нет в Android libc
 RUN echo "ac_cv_file__dev_ptmx=yes" > config.site && \
     echo "ac_cv_file__dev_ptc=no" >> config.site && \
     echo "ac_cv_func_wcsftime=no" >> config.site && \
@@ -107,21 +121,24 @@ RUN CONFIG_SITE=config.site ./configure \
 RUN make -j$(nproc) libpython3.11.so || true
 RUN make install -i
 
+# Копируем конфиги sysconfig, чтобы pip понимал, что мы на Android
 RUN mkdir -p ${WORK_DIR}/python-install/lib/python3.11
-
 RUN find ${WORK_DIR}/Python-${PYTHON_VERSION} -name "_sysconfigdata*.py" -not -name "*x86_64*" \
     -exec cp {} ${WORK_DIR}/python-install/lib/python3.11/_sysconfigdata__linux_aarch64-linux-android.py \;
-
 RUN cp ${WORK_DIR}/python-install/lib/python3.11/_sysconfigdata__linux_aarch64-linux-android.py \
        /usr/local/lib/python3.11/_sysconfigdata__linux_aarch64-linux-android.py
 
+# 8. Сборка maxapi-python и зависимостей
 WORKDIR ${OUTPUT_DIR}
 
-ENV TARGET_PACKAGE="heroku-tl-new==1.7.2"
+# Целевой пакет
+ENV TARGET_PACKAGE="maxapi-python"
 
+# Настройка линкера для Rust (для pydantic-core/sqlmodel)
 ENV CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER="${CC}"
 ENV CARGO_TARGET_AARCH64_LINUX_ANDROID_RUSTFLAGS="-C link-arg=-L${WORK_DIR}/python-install/lib -C link-arg=-lpython3.11 -L ${OPENSSL_LIB_DIR}"
 
+# Скрипт сборки
 RUN echo "#!/bin/bash" > build.sh && \
     echo "set -e" >> build.sh && \
     echo "export PYTHON_ANDROID_HOME=${WORK_DIR}/python-install" >> build.sh && \
@@ -130,42 +147,44 @@ RUN echo "#!/bin/bash" > build.sh && \
     echo "export LDSHARED=\"${CC} -shared\"" >> build.sh && \
     echo "export _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata__linux_aarch64-linux-android" >> build.sh && \
     echo "export _PYTHON_HOST_PLATFORM=linux-aarch64" >> build.sh && \
+    # PyO3 (Rust bindings) configuration
     echo "export PYO3_CROSS_LIB_DIR=${WORK_DIR}/python-install/lib" >> build.sh && \
     echo "export PYO3_CROSS_INCLUDE_DIR=${WORK_DIR}/python-install/include/python3.11" >> build.sh && \
     echo "export PYO3_CROSS_PYTHON_VERSION=3.11" >> build.sh && \
     echo "export CARGO_BUILD_TARGET=aarch64-linux-android" >> build.sh && \
     echo "export PYO3_NO_PYTHON_VERSION_CHECK=1" >> build.sh && \
+    # OpenSSL bindings configuration
     echo "export AARCH64_LINUX_ANDROID_OPENSSL_DIR=${OPENSSL_DIR}" >> build.sh && \
     echo "export AARCH64_LINUX_ANDROID_OPENSSL_LIB_DIR=${OPENSSL_LIB_DIR}" >> build.sh && \
     echo "export AARCH64_LINUX_ANDROID_OPENSSL_INCLUDE_DIR=${OPENSSL_INCLUDE_DIR}" >> build.sh && \
     echo "export OPENSSL_STATIC=1" >> build.sh && \
     echo "" >> build.sh && \
     echo "echo 'Starting Build for ${TARGET_PACKAGE}...'" >> build.sh && \
+    # Команда сборки колес
     echo "pip wheel ${TARGET_PACKAGE} --wheel-dir=${OUTPUT_DIR} --no-binary=:all: --no-build-isolation -v" >> build.sh && \
     chmod +x build.sh
 
 RUN ./build.sh
 
+# 9. Патчинг колес (исправление ссылок на библиотеки)
 RUN echo "Patching wheels to fix libpython dependency name..." && \
     for whl in *.whl; do \
         echo "Processing $whl..."; \
         mkdir -p tmp_wheel; \
         unzip -q "$whl" -d tmp_wheel; \
-        # Find all .so files
         find tmp_wheel -name "*.so" | while read so_file; do \
-            # If it links against the wrong name, swap it
             if patchelf --print-needed "$so_file" | grep -q "libpython3.11.so.1.0"; then \
                 echo "  -> Patching $so_file (replacing needed lib)"; \
                 patchelf --replace-needed "libpython3.11.so.1.0" "libpython3.11.so" "$so_file"; \
             fi; \
         done; \
-        # Repack
         cd tmp_wheel; \
         zip -r -q "../$whl" .; \
         cd ..; \
         rm -rf tmp_wheel; \
     done
 
+# 10. Переименование для совместимости с Android установщиками
 RUN for f in *.whl; do \
       if [ -f "$f" ]; then \
         new_name=$(echo "$f" | sed 's/linux_aarch64/android_24_arm64_v8a/g'); \
@@ -175,10 +194,15 @@ RUN for f in *.whl; do \
       fi \
     done
 
-RUN echo "<html><head><title>Heroku-TL Wheels</title></head><body>" > index.html && \
-    echo "<h1>Wheels for heroku-tl-new (API 24, ARM64) [PATCHED NAME]</h1><ul>" >> index.html && \
+# 11. Создание HTML индекса
+RUN echo "<html><head><title>MandreLib Wheels</title></head><body>" > index.html && \
+    echo "<h1>Wheels for maxapi-python (API 24, ARM64)</h1><ul>" >> index.html && \
     find . -name "*.whl" -printf "<li><a href=\"%P\">%P</a></li>\n" | sort >> index.html && \
     echo "</ul></body></html>" >> index.html
 
+# Настройка прав для пользователя Hugging Face (user 1000)
+RUN chmod -R 777 ${OUTPUT_DIR}
+
+# Открытие порта 7860 и запуск сервера
 EXPOSE 7860
-CMD ["python3", "-m", "http.server", "7860"]
+CMD ["python3", "-m", "http.server", "7860"]