Update Dockerfile

Dockerfile

@@ -1,7 +1,5 @@
 FROM python:3.11-bookworm
 
-# 1. Установка системных зависимостей
-# Добавляем ninja-build и другие инструменты
 RUN apt-get update && apt-get install -y \
     wget unzip git build-essential pkg-config \
     libffi-dev libssl-dev zlib1g-dev ncurses-dev \
@@ -10,40 +8,32 @@ RUN apt-get update && apt-get install -y \
     cmake llvm clang \
     perl \
     patchelf zip \
-    libsndfile1-dev \
-    ninja-build \
     && rm -rf /var/lib/apt/lists/*
 
-# Создаем пользователя
-RUN useradd -m -u 1000 user
-ENV HOME=/home/user
-ENV WORK_DIR=/home/user/build
-ENV OUTPUT_DIR=/home/user/app/wheels
-
-RUN mkdir -p ${WORK_DIR} ${OUTPUT_DIR} && chown -R user:user /home/user
-
-USER user
-WORKDIR ${WORK_DIR}
-
-# 2. Переменные окружения
+ENV WORK_DIR=/build
+ENV OUTPUT_DIR=/app/wheels
 ENV NDK_VERSION=r26b
 ENV ANDROID_API=24
 ENV ANDROID_ARCH=aarch64
-ENV ANDROID_HOME=${HOME}/android-sdk
-ENV NDK_HOME=${HOME}/android-ndk
-# Дублируем для совместимости разных систем сборки
-ENV ANDROID_NDK_ROOT=${HOME}/android-ndk 
+ENV ANDROID_HOME=/opt/android-sdk
+ENV NDK_HOME=/opt/android-ndk
+ENV ANDROID_NDK_ROOT=/opt/android-ndk
 ENV PYTHON_VERSION=3.11.9
 ENV OPENSSL_VERSION=3.3.0
-ENV RUSTUP_HOME=${HOME}/.rustup
-ENV CARGO_HOME=${HOME}/.cargo
-ENV PATH=$PATH:${HOME}/.cargo/bin:${HOME}/.local/bin
-
-# 3. Установка Rust (для tokenizers)
+ENV RUSTUP_HOME=/opt/rust
+ENV CARGO_HOME=/opt/rust
+ENV PATH=$PATH:/opt/rust/bin
 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. Скачивание и настройка NDK
+RUN pip install --upgrade pip && \
+    pip install --no-cache-dir \
+    Cython wheel setuptools poetry-core hatchling \
+    hatch-fancy-pypi-readme hatch-vcs flit-core \
+    expandvars maturin typing-extensions
+
+WORKDIR ${WORK_DIR}
+
 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} && \
@@ -65,32 +55,31 @@ ENV CFLAGS="-target ${TARGET} -fPIC -D__ANDROID__"
 ENV CXXFLAGS="-target ${TARGET} -fPIC -D__ANDROID__"
 ENV LDFLAGS="-target ${TARGET} -fPIC"
 
-# 5. Сборка OpenSSL (Static)
 WORKDIR ${WORK_DIR}
 RUN wget -q https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz && \
     tar -xf openssl-${OPENSSL_VERSION}.tar.gz
 
 WORKDIR ${WORK_DIR}/openssl-${OPENSSL_VERSION}
-# Добавляем путь к NDK в начало PATH для Configure
-ENV PATH=${TOOLCHAIN}/bin:$PATH
+
 RUN ./Configure android-arm64 \
     -D__ANDROID_API__=${ANDROID_API} \
     --prefix=${WORK_DIR}/openssl-install \
     --openssldir=${WORK_DIR}/openssl-install \
-    no-shared no-tests && \
-    make -j$(nproc) && make install_sw
+    no-shared no-tests
+
+RUN make -j$(nproc) && make install_sw
 
 ENV OPENSSL_DIR=${WORK_DIR}/openssl-install
 ENV OPENSSL_LIB_DIR=${OPENSSL_DIR}/lib64
 ENV OPENSSL_INCLUDE_DIR=${OPENSSL_DIR}/include
 ENV OPENSSL_STATIC=1
 
-# 6. Сборка Python (Host & Target stub)
 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}
+
 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 && \
@@ -108,109 +97,75 @@ RUN CONFIG_SITE=config.site ./configure \
     --disable-ipv6 \
     --enable-shared \
     --without-ensurepip \
-    --with-build-python=python3 \
+    --with-build-python=/usr/local/bin/python3 \
     --disable-test-modules \
     --without-doc-strings \
     --with-system-ffi=no \
     --without-decimal \
-    --without-ctypes && \
-    make -j$(nproc) libpython3.11.so && \
-    make install -i
+    --without-ctypes
+
+RUN make -j$(nproc) libpython3.11.so || true
+RUN make install -i
 
-# Подготавливаем файл sysconfig
 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 \;
 
-# !!! ИСПРАВЛЕНИЕ !!! 
-# Копируем конфиг в правильное место (/usr/local/lib, а не /usr/lib)
-USER root
 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
-USER user
 
-# 7. УСТАНОВКА ИНСТРУМЕНТОВ СБОРКИ
-RUN pip install --upgrade pip && \
-    pip install --user --no-cache-dir \
-    Cython wheel setuptools \
-    "meson-python>=0.13.1" "ninja>=1.10" "patchelf" \
-    "maturin>=1.0,<2.0" \
-    "scikit-build-core" "cmake" \
-    "flit-core" "hatchling" \
-    "cffi" "pyyaml"
-
-# 8. Настройка переменных окружения для кросс-компиляции
-ENV PKG_CONFIG_PATH=""
-ENV PYTHON_ANDROID_HOME=${WORK_DIR}/python-install
-ENV _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata__linux_aarch64-linux-android
-ENV _PYTHON_HOST_PLATFORM=linux-aarch64
-# Добавляем путь к sysconfig в PYTHONPATH для гарантии
-ENV PYTHONPATH=/usr/local/lib/python3.11
-
-# Флаги для Rust/Maturin
-ENV PYO3_CROSS_LIB_DIR=${PYTHON_ANDROID_HOME}/lib
-ENV PYO3_CROSS_INCLUDE_DIR=${PYTHON_ANDROID_HOME}/include/python3.11
-ENV PYO3_CROSS_PYTHON_VERSION=3.11
-ENV CARGO_BUILD_TARGET=aarch64-linux-android
-ENV CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER="${CC}"
-ENV CARGO_TARGET_AARCH64_LINUX_ANDROID_RUSTFLAGS="-C link-arg=-L${PYTHON_ANDROID_HOME}/lib -C link-arg=-lpython3.11 -L${OPENSSL_LIB_DIR}"
+WORKDIR ${OUTPUT_DIR}
 
-# Флаги для C/C++
-ENV CFLAGS="${CFLAGS} -I${PYTHON_ANDROID_HOME}/include/python3.11 -I${OPENSSL_INCLUDE_DIR}"
-ENV LDFLAGS="${LDFLAGS} -L${PYTHON_ANDROID_HOME}/lib -L${OPENSSL_LIB_DIR}"
-ENV LDSHARED="${CC} -shared"
+ENV TARGET_PACKAGE="heroku-tl-new==1.7.2"
 
-WORKDIR ${OUTPUT_DIR}
+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}"
 
-# 9. Скрипт сборки
 RUN echo "#!/bin/bash" > build.sh && \
     echo "set -e" >> build.sh && \
-    # Специфичные настройки для Llama.cpp
-    echo "export CMAKE_ARGS=\"-DANDROID_ABI=arm64-v8a -DANDROID_PLATFORM=android-${ANDROID_API} -DCMAKE_TOOLCHAIN_FILE=${NDK_HOME}/build/cmake/android.toolchain.cmake -DGGML_OPENCL=OFF -DGGML_VULKAN=OFF\"" >> build.sh && \
-    echo "" >> build.sh && \
-    echo "build_pkg() {" >> build.sh && \
-    echo "  PKG=\$1" >> build.sh && \
-    echo "  echo \"--------------------------------------------------\"" >> build.sh && \
-    echo "  echo \"BUILDING: \$PKG\"" >> build.sh && \
-    echo "  echo \"--------------------------------------------------\"" >> build.sh && \
-    # Используем --no-deps, чтобы pip не пытался установить зависимости в хост-систему
-    echo "  python3 -m pip wheel \"\$PKG\" --wheel-dir=${OUTPUT_DIR} --no-binary=:all: --no-build-isolation --no-deps -v || echo \"FAILED: \$PKG\"" >> build.sh && \
-    echo "}" >> build.sh && \
+    echo "export PYTHON_ANDROID_HOME=${WORK_DIR}/python-install" >> build.sh && \
+    echo "export CFLAGS=\"${CFLAGS} -I\${PYTHON_ANDROID_HOME}/include/python3.11 -I${OPENSSL_INCLUDE_DIR}\"" >> build.sh && \
+    echo "export LDFLAGS=\"${LDFLAGS} -L\${PYTHON_ANDROID_HOME}/lib -L${OPENSSL_LIB_DIR}\"" >> 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 && \
+    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 && \
+    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 "build_pkg 'numpy<2.0'" >> build.sh && \
-    echo "build_pkg 'flask'" >> build.sh && \
-    echo "build_pkg 'flask_compress'" >> build.sh && \
-    echo "build_pkg 'tokenizers'" >> build.sh && \
-    echo "build_pkg 'transformers'" >> build.sh && \
-    echo "build_pkg 'llama-cpp-python'" >> build.sh && \
-    # soundfile часто проблемный из-за libsndfile, пробуем
-    echo "build_pkg 'soundfile'" >> build.sh && \
-    echo "echo 'Build complete.'" >> 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
 
-# 10. Патчинг (исправление имени библиотеки Python)
-RUN echo "Patching wheels..." && \
+RUN echo "Patching wheels to fix libpython dependency name..." && \
     for whl in *.whl; do \
-        if [ -f "$whl" ]; then \
-            echo "Processing $whl..."; \
-            mkdir -p tmp_wheel; \
-            unzip -q "$whl" -d tmp_wheel; \
-            find tmp_wheel -name "*.so" | while read so_file; do \
-                # Если библиотека ссылается на libpython3.11.so.1.0, меняем на libpython3.11.so
-                if patchelf --print-needed "$so_file" | grep -q "libpython3.11.so.1.0"; then \
-                    echo "Patching $so_file"; \
-                    patchelf --replace-needed "libpython3.11.so.1.0" "libpython3.11.so" "$so_file"; \
-                fi; \
-            done; \
-            cd tmp_wheel; zip -r -q "../$whl" .; cd ..; rm -rf tmp_wheel; \
-        fi; \
+        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
 
-# 11. Переименование
 RUN for f in *.whl; do \
       if [ -f "$f" ]; then \
         new_name=$(echo "$f" | sed 's/linux_aarch64/android_24_arm64_v8a/g'); \
@@ -220,9 +175,8 @@ RUN for f in *.whl; do \
       fi \
     done
 
-# 12. Индекс
-RUN echo "<html><head><title>MandreLib Wheels</title></head><body>" > index.html && \
-    echo "<h1>Android Wheels (API 24, ARM64)</h1><ul>" >> index.html && \
+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 && \
     find . -name "*.whl" -printf "<li><a href=\"%P\">%P</a></li>\n" | sort >> index.html && \
     echo "</ul></body></html>" >> index.html