Update Dockerfile

Dockerfile

@@ -1,19 +1,16 @@
-FROM python:3.11
+FROM python:3.11.10-bookworm
 
 # 1. Системные зависимости
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get install -y \
     wget unzip build-essential git pkg-config \
-    automake autoconf libtool \
+    automake autoconf libtool zip \
     && rm -rf /var/lib/apt/lists/*
 
-# 2. Android NDK (r25c / API 30)
+# 2. Настройка NDK (r25c для API 30)
 ENV ANDROID_NDK_VERSION=r25c
 ENV ANDROID_API=30
-ENV ANDROID_ARCH=arm64
-ENV ANDROID_ABI=arm64-v8a
 ENV NDK_ROOT=/opt/android-ndk
-ENV ANDROID_NDK_ROOT=/opt/android-ndk
 ENV PATH=$NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH
 
 WORKDIR /opt
@@ -22,125 +19,78 @@ RUN wget -q https://dl.google.com/android/repository/android-ndk-${ANDROID_NDK_V
     mv android-ndk-${ANDROID_NDK_VERSION} android-ndk && \
     rm android-ndk-${ANDROID_NDK_VERSION}-linux.zip
 
-# Переменные компиляции
+# Переменные компилятора
 ENV CC="aarch64-linux-android${ANDROID_API}-clang"
 ENV CXX="aarch64-linux-android${ANDROID_API}-clang++"
 ENV AR="llvm-ar"
 ENV RANLIB="llvm-ranlib"
-ENV STRIP="llvm-strip"
-ENV READELF="llvm-readelf"
 ENV PREFIX=/opt/android-libs
 
-# ВАЖНО: Добавляем -fPIC во все глобальные флаги
-ENV CFLAGS="-fPIC"
-ENV CXXFLAGS="-fPIC"
+# 3. Сборка статических зависимостей (fPIC обязательно)
+WORKDIR /build/deps
 
-RUN mkdir -p $PREFIX
-
-# 3. ZLIB (Static + fPIC)
-WORKDIR /build/zlib
+# ZLIB
 RUN wget -q https://zlib.net/zlib-1.3.1.tar.gz && tar -xf zlib-1.3.1.tar.gz && cd zlib-1.3.1 && \
-    # zlib configure читает CFLAGS из окружения
-    export CFLAGS="-fPIC" && \
-    ./configure --prefix=$PREFIX --static && \
-    make -j4 && make install
+    CFLAGS="-fPIC" ./configure --prefix=$PREFIX --static && make -j4 install
 
-# 4. OpenSSL (Static + fPIC)
-WORKDIR /build/openssl
+# OPENSSL
 RUN wget -q https://www.openssl.org/source/openssl-3.2.0.tar.gz && tar -xf openssl-3.2.0.tar.gz && cd openssl-3.2.0 && \
-    # Добавляем -fPIC явно в опции конфигурации
-    ./Configure android-arm64 \
-    -D__ANDROID_API__=${ANDROID_API} \
-    --prefix=$PREFIX \
-    no-shared \
-    -fPIC \
-    && \
-    make -j4 && make install_sw
+    ./Configure android-arm64 -D__ANDROID_API__=${ANDROID_API} --prefix=$PREFIX no-shared -fPIC && \
+    make -j4 install_sw
 
-# 5. Curl (Static + fPIC)
-WORKDIR /build/curl
+# CURL
 RUN wget -q https://curl.se/download/curl-8.5.0.tar.gz && tar -xf curl-8.5.0.tar.gz && cd curl-8.5.0 && \
-    ./configure \
-    --host=aarch64-linux-android \
-    --prefix=$PREFIX \
-    --disable-shared --enable-static \
-    --with-openssl=$PREFIX \
-    --with-zlib=$PREFIX \
-    --disable-ldap --disable-ldaps \
-    --disable-rtsp --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap \
-    --disable-smtp --disable-gopher --disable-mqtt \
-    CFLAGS="-I$PREFIX/include -fPIC" LDFLAGS="-L$PREFIX/lib" && \
-    make -j4 && make install
-
-# 6. Python заголовки
-WORKDIR /opt/python-src
-ENV PY_VERSION=3.11.9
-RUN wget -q https://www.python.org/ftp/python/${PY_VERSION}/Python-${PY_VERSION}.tgz && \
-    tar -xzf Python-${PY_VERSION}.tgz && \
-    mv Python-${PY_VERSION} python3-android
-
-WORKDIR /opt/python-src/python3-android
-RUN ./configure \
-    --host=aarch64-linux-android \
-    --build=x86_64-linux-gnu \
-    --with-build-python=/usr/local/bin/python3 \
-    --enable-shared \
-    --disable-ipv6 \
-    ac_cv_file__dev_ptmx=no \
-    ac_cv_file__dev_ptc=no \
-    CC="aarch64-linux-android${ANDROID_API}-clang" \
-    CXX="aarch64-linux-android${ANDROID_API}-clang++"
-
-# 7. СБОРКА WHEELS
+    ./configure --host=aarch64-linux-android --prefix=$PREFIX --disable-shared --enable-static \
+    --with-openssl=$PREFIX --with-zlib=$PREFIX --disable-ldap \
+    CFLAGS="-fPIC -I$PREFIX/include" LDFLAGS="-L$PREFIX/lib" && \
+    make -j4 install
+
+# 4. ПОДГОТОВКА PYTHON 3.11.10 ДЛЯ АНДРОИД
+# Нам нужно собрать "заготовку" питона, чтобы получить libpython3.11.so и правильные хидеры
+WORKDIR /opt/python-android
+RUN wget -q https://www.python.org/ftp/python/3.11.10/Python-3.11.10.tgz && tar -xf Python-3.11.10.tgz
+WORKDIR /opt/python-android/Python-3.11.10
+RUN ./configure --host=aarch64-linux-android --build=x86_64-linux-gnu \
+    --with-build-python=python3 --enable-shared --without-ensurepip \
+    ac_cv_file__dev_ptmx=no ac_cv_file__dev_ptc=no \
+    CC="$CC" CXX="$CXX" AR="$AR" RANLIB="$RANLIB"
+# Нам нужна только библиотека и конфиг
+RUN make -j4 libpython3.11.so
+
+# 5. СБОРКА WHEELS (PyCurl & Wget)
 WORKDIR /build/wheels
-RUN pip install build wheel
-
-# FAKE curl-config
-RUN echo '#!/bin/bash' > /usr/bin/curl-config-android && \
-    echo 'case "$1" in' >> /usr/bin/curl-config-android && \
-    echo '  --version) echo "libcurl 8.5.0";;' >> /usr/bin/curl-config-android && \
-    echo '  --features) echo "SSL IPv6 UnixSockets libz AsynchDNS Largefile HSTS Alt-Svc HTTPS-proxy";;' >> /usr/bin/curl-config-android && \
-    echo '  --libs|--static-libs) echo "-L'${PREFIX}'/lib -lcurl -lssl -lcrypto -lz";;' >> /usr/bin/curl-config-android && \
-    echo '  --cflags) echo "-I'${PREFIX}'/include -DANDROID";;' >> /usr/bin/curl-config-android && \
-    echo '  --prefix) echo "'${PREFIX}'";;' >> /usr/bin/curl-config-android && \
-    echo '  *) exit 0;;' >> /usr/bin/curl-config-android && \
-    echo 'esac' >> /usr/bin/curl-config-android && \
-    chmod +x /usr/bin/curl-config-android
-
-# Скрипт сборки
-RUN echo '#!/bin/bash' > build_wheels.sh && \
-    echo 'export CC="aarch64-linux-android'${ANDROID_API}'-clang"' >> build_wheels.sh && \
-    echo 'export LDSHARED="aarch64-linux-android'${ANDROID_API}'-clang -shared"' >> build_wheels.sh && \
-    # Добавляем -fPIC и сюда для надежности
-    echo 'export CFLAGS="-I/opt/python-src/python3-android -I/opt/python-src/python3-android/Include -I'${PREFIX}'/include -DANDROID -fPIC"' >> build_wheels.sh && \
-    echo 'export LDFLAGS="-L/opt/python-src/python3-android -L'${PREFIX}'/lib -lcurl -lssl -lcrypto -lz"' >> build_wheels.sh && \
-    \
-    # 1. WGET
-    echo 'echo "Building wget..."' >> build_wheels.sh && \
-    echo 'pip wheel wget --no-binary :all: --no-deps -w dist/' >> build_wheels.sh && \
-    \
-    # 2. PyCryptodome (добавил, так как был в запросе выше, на всякий случай)
-    echo 'echo "Building PyCryptodome..."' >> build_wheels.sh && \
-    echo 'pip wheel pycryptodome --no-binary :all: --no-deps -w dist/' >> build_wheels.sh && \
-    \
-    # 3. PYCURL
-    echo 'echo "Building PyCurl..."' >> build_wheels.sh && \
-    echo 'export PYCURL_CURL_CONFIG=/usr/bin/curl-config-android' >> build_wheels.sh && \
-    echo 'export PYCURL_SSL_LIBRARY=openssl' >> build_wheels.sh && \
-    echo 'pip wheel pycurl --no-binary :all: --no-deps -w dist/' >> build_wheels.sh
-
-RUN chmod +x build_wheels.sh
-RUN ./build_wheels.sh
-
-# 8. Переименование
+RUN pip install wheel setuptools
+
+# Создаем скрипт-обманку curl-config
+RUN echo '#!/bin/bash\ncase "$1" in --version) echo "libcurl 8.5.0";; --features) echo "SSL libz HTTPS";; --libs|--static-libs) echo "-L'$PREFIX'/lib -lcurl -lssl -lcrypto -lz";; --cflags) echo "-I'$PREFIX'/include -DANDROID";; --prefix) echo "'$PREFIX'";; *) exit 0;; esac' > /usr/bin/curl-config-android && chmod +x /usr/bin/curl-config-android
+
+# Сборка
+RUN echo '#!/bin/bash\n\
+export CC="aarch64-linux-android'${ANDROID_API}'-clang"\n\
+export LDSHARED="'$CC' -shared -L/opt/python-android/Python-3.11.10 -lpython3.11"\n\
+export CFLAGS="-I/opt/python-android/Python-3.11.10/Include -I/opt/python-android/Python-3.11.10 -I'$PREFIX'/include -fPIC -DANDROID"\n\
+export LDFLAGS="-L/opt/python-android/Python-3.11.10 -L'$PREFIX'/lib -lpython3.11 -lcurl -lssl -lcrypto -lz"\n\
+\n\
+echo "--- Сборка PyCurl ---"\n\
+export PYCURL_CURL_CONFIG=/usr/bin/curl-config-android\n\
+export PYCURL_SSL_LIBRARY=openssl\n\
+# Мы используем --plat-name, чтобы заставить pip поставить правильный тег\n\
+pip wheel pycurl --no-binary :all: --no-deps -w dist/ --plat-name android_arm64\n\
+\n\
+echo "--- Сборка wget ---"\n\
+pip wheel wget --no-binary :all: --no-deps -w dist/ --plat-name android_arm64' > build.sh
+
+RUN chmod +x build.sh && ./build.sh
+
+# 6. ПЕРЕИМЕНОВАНИЕ И ВЫДАЧА
 WORKDIR /output
 RUN cd /build/wheels/dist && \
     for file in *.whl; do \
-        PACKAGE_NAME=$(echo $file | cut -d'-' -f1) && \
-        VERSION=$(echo $file | cut -d'-' -f2) && \
-        NEW_NAME="${PACKAGE_NAME}-${VERSION}-cp311-cp311-android_21-30_arm64_v8a.whl" && \
-        mv "$file" "/output/$NEW_NAME"; \
+        # Меняем linux_x86_64 на твой специфичный тег
+        NEW_NAME=$(echo $file | sed "s/linux_x86_64/android_21_30_arm64_v8a/g" | sed "s/any/android_21_30_arm64_v8a/g"); \
+        # Если в имени всё еще нет нужного формата, форсируем его
+        FINAL_NAME=$(echo $NEW_NAME | cut -d"-" -f1,2)"-cp311-cp311-android_21-30_arm64_v8a.whl"; \
+        mv "$file" "/output/$FINAL_NAME"; \
     done
 
-# 9. Выдача
 CMD ["python3", "-m", "http.server", "7860", "--directory", "/output"]