Merge pull request #149 from schwankner/fix/arm64-ubuntu-base

fix: ubuntu:24.04 base image + remove platforms: flag to fix ARM64 on RK3588

Author: NotPunchnox

.github/workflows/docker-publish.yml

@@ -48,10 +48,14 @@ jobs:
       # Set up BuildKit Docker container builder to be able to build
       # multi-platform images and export cache
       # https://github.com/docker/setup-buildx-action
+      #
+      # NOTE: Do NOT set `platforms: linux/arm64` here — on a native
+      # ubuntu-24.04-arm runner this forces QEMU-backed cross-compilation
+      # even though the runner is natively arm64, causing the docker-container
+      # builder to pull and cache amd64 base layers and contaminate subsequent
+      # arm64 builds.  Omitting the flag builds for the runner's native arch.
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v4
-        with:
-          platforms: linux/arm64
 
       # Login against a Docker registry except on PR
       # https://github.com/docker/login-action
@@ -73,6 +77,10 @@ jobs:
 
       # Build and push Docker image with Buildx
       # https://github.com/docker/build-push-action
+      #
+      # NOTE: Do NOT set `platforms: linux/arm64` here — same reason as above.
+      # The cache key uses the -arm64 suffix to avoid reusing the stale amd64
+      # cache that existed before the runner switch to ubuntu-24.04-arm.
       - name: Build and push Docker image
         id: build-and-push
         uses: docker/build-push-action@v7
@@ -81,9 +89,8 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME_LC }}:buildcache
-          cache-to: type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME_LC }}:buildcache,mode=max
-          platforms: linux/arm64
+          cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME_LC }}:buildcache-arm64
+          cache-to: type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME_LC }}:buildcache-arm64,mode=max
 
       # Sign the resulting Docker image digest except on PRs.
       # This will only write to the public Rekor transparency log when the Docker

Dockerfile

@@ -1,12 +1,27 @@
-FROM python:3.12-slim
+FROM ubuntu:24.04
+
+# RK3588 (Cortex-A76/A55) is ARMv8.2-A — it does NOT support Pointer
+# Authentication (PAC, ARMv8.3-A).  Debian Trixie ARM64 packages
+# (python:3.12-slim) are compiled with PAC guards; the kernel returns
+# ENOEXEC for those binaries on RK3588, causing "exec format error" at
+# container startup.  Ubuntu 24.04 ARM64 packages do NOT use PAC and
+# run correctly on ARMv8.2-A hardware.
+ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update \
-    && apt-get install -y --no-install-recommends libgomp1 wget curl sudo git build-essential \
-    && apt-get install -y ffmpeg libsm6 libxext6 \
+    && apt-get install -y --no-install-recommends \
+       python3.12 python3.12-dev python3-pip python3.12-venv \
+       libgomp1 wget curl sudo git build-essential \
+       ffmpeg libsm6 libxext6 \
     && rm -rf /var/cache/apt/archives /var/lib/apt/lists/*
 
-# Fix setupttols version to prevent error: No module named 'pkg_resources' 
-RUN python -m pip --no-cache-dir install "setuptools<82.0.0"
+# Use a virtual environment to avoid Ubuntu 24.04's PEP 668
+# "externally-managed-environment" restriction.
+RUN python3 -m venv /opt/venv
+ENV PATH="/opt/venv/bin:$PATH"
+
+RUN pip install --no-cache-dir --upgrade pip \
+    && pip install --no-cache-dir "setuptools<82.0.0"
 
 WORKDIR /opt/rkllama
 
@@ -18,13 +33,13 @@ RUN chmod 755 /usr/lib/librkllmrt.so && ldconfig
 COPY ./src/rkllama/lib/librknnrt.so /usr/lib/
 RUN chmod 755 /usr/lib/librknnrt.so && ldconfig
 
-# Copy the source and other resourvces of the RKllama project
+# Copy the source and other resources of the RKllama project
 COPY ./src /opt/rkllama/src
 RUN mkdir /opt/rkllama/models
 COPY README.md LICENSE pyproject.toml /opt/rkllama/
 
-# Install RKLlama project
-RUN python -m pip --no-cache-dir install .
+# Install RKllama project
+RUN pip install --no-cache-dir .
 
 EXPOSE 8080