Update example Dockerfiles

Author: twistedfall

CHANGES.md

@@ -283,7 +283,7 @@
   * Don't require `runtime` feature of `clang`.
 
 * 0.81.2
-  * Fix building when crosscompiling with target-specific RUSTFLAGS.
+  * Fix building when cross-compiling with target-specific RUSTFLAGS.
 
 * 0.81.1
   * Fix building on macOS (fixes https://github.com/twistedfall/opencv-rust/issues/460).
@@ -309,7 +309,7 @@
 
 * 0.78.1
   * Automatically implement `Clone` for those classes that are constructor-copiable in C++, e.g. `KeyPoint`.
-  * Fixes for crosscompiling (kudos to icedrocket).
+  * Fixes for cross-compiling (kudos to icedrocket).
 
 * 0.78.0
   * Don't strip "lib" prefix from linked libraries when building with MSVC (kudos to icedrocket)
@@ -648,7 +648,7 @@
   * Internal improvements and cleanups
 
 * 0.38.0
-  * Fix crosscompilation when targeting Windows platform.
+  * Fix cross-compilation when targeting Windows platform.
   * Fix generation of bigger binaries
 
 * 0.37.0

INSTALL.md

@@ -24,6 +24,7 @@ and additionally to support more OpenCV modules:
 `zypper install opencv-devel clang-devel gcc-c++`
 
 #### Other Linux:
+
 You have several options of getting the OpenCV library:
 
 * install it from the repository, make sure to install `-dev` packages because they contain headers necessary
@@ -36,8 +37,9 @@ You have several options of getting the OpenCV library:
 
 Additionally, please make sure to install `clang` package or its derivative that contains `libclang.so` and
 `clang` binary.
-  * Gentoo, Fedora: `clang`
-  * Debian, Ubuntu: `clang` and `libclang-dev`
+
+* Gentoo, Fedora: `clang`
+* Debian, Ubuntu: `clang` and `libclang-dev`
 
 ### Windows package
 
@@ -78,7 +80,8 @@ Get OpenCV from homebrew:
   brew install llvm
   ```
 
-  If you have already installed OpenCV via Homebrew, there is no need to configure any environment variables specifically for OpenCV on macOS. The OpenCV installation can be automatically detected if it was installed through Homebrew.
+  If you have already installed OpenCV via Homebrew, there is no need to configure any environment variables specifically for
+  OpenCV on macOS. The OpenCV installation can be automatically detected if it was installed through Homebrew.
 
   To take advantage of this automatic detection, refrain from setting the following environment variables:
 
@@ -112,9 +115,9 @@ you can get some information on how to perform the build in CI scripts:
 [install-ubuntu.sh](https://github.com/twistedfall/opencv-rust/blob/master/ci/install-ubuntu.sh) and
 [script.sh](https://github.com/twistedfall/opencv-rust/blob/master/ci/script.sh), search for `"static"` string.
 
-### Crosscompilation
+### Cross-compilation
 
-Cross-compilation is supported to at least some extent. The ability to crosscompile projects using `opencv` from x86-64
+Cross-compilation is supported to at least some extent. The ability to cross-compile projects using `opencv` from x86-64
 Linux host machine to Raspberry Pi is tested regularly. Cross-compilation is notoriously difficult to set up, so you can
 use this example [rpi-xcompile.Dockerfile](https://github.com/twistedfall/opencv-rust/blob/master/tools/docker/rpi-xcompile.Dockerfile).
 
@@ -128,4 +131,4 @@ Building this image requries `qemu-arm` to be present on the host system and the
 
 After the successful build you will have an image configured for cross-compilation to Raspberry Pi. It will contain the
 sample build script `/usr/local/bin/cargo-xbuild` that you can check for the correct environment setup and the specific
-command line arguments to use when crosscompiling the project inside the container created from that image.
+command line arguments to use when cross-compiling the project inside the container created from that image.

tools/docker/rpi-xcompile.Dockerfile

@@ -5,28 +5,37 @@
 #
 # After the successful build you will have an image configured for cross-compilation to Raspberry Pi. It will contain the
 # sample build script `/usr/local/bin/cargo-xbuild` that you can check for the correct environment setup and the specific
-# command line arguments to use when crosscompiling the project inside the container created from that image.
+# command line arguments to use when cross-compiling the project inside the container created from that image.
 
 
 # Download and extract rpi root filesystem
-FROM alpine:3.18
+FROM alpine:3.22
 
-RUN set -xeu && \
-    apk add xz
-
-ADD https://downloads.raspberrypi.org/raspios_lite_armhf/root.tar.xz /
+ADD https://downloads.raspberrypi.org/raspios_lite_armhf/images/raspios_lite_armhf-2025-10-02/2025-10-01-raspios-trixie-armhf-lite.img.xz /raspios-lite-armhf.img.xz
 
+# chmod calls are necessary because 7zip doesn't preserve file permissions during extraction
 RUN set -xeu && \
-    mkdir "/rpi-root" && \
-    tar xpaf /root.tar.xz -C /rpi-root
-
-
-# Prepare the root of the rpi filesystem, it's going to be used later for crosscompilation
+    apk add xz 7zip && \
+    unxz /raspios-lite-armhf.img.xz && \
+    7z x -so /raspios-lite-armhf.img 1.img > rootfs.img && \
+    7z x -snld -o/rpi-root rootfs.img && \
+    chmod -R 755 /rpi-root/bin /rpi-root/boot /rpi-root/dev /rpi-root/etc /rpi-root/home /rpi-root/lib /rpi-root/media \
+                 /rpi-root/mnt /rpi-root/opt /rpi-root/run /rpi-root/sbin /rpi-root/srv /rpi-root/usr /rpi-root/var && \
+    chmod -R 1777 /rpi-root/tmp && \
+    chmod -R 555 /rpi-root/sys /rpi-root/proc && \
+    chmod -R 700 /rpi-root/root
+
+# Prepare the root of the rpi filesystem, it's going to be used later for cross-compilation
 # This step requries qemu-arm to be present on the host system and the corresponding binfmt-misc set up
 FROM scratch
 
 COPY --from=0 /rpi-root /
 
+# initramfs-tools breaking dist-upgrade in Docker:
+# mkinitramfs: failed to determine device for /
+RUN set -xeu && \
+    DEBIAN_FRONTEND=noninteractive apt-get purge -y initramfs-tools
+
 RUN set -xeu && \
     apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y && \
@@ -44,11 +53,11 @@ RUN set -xeu && \
 
 # Specify dependencies that you need to have on rpi
 RUN set -xeu && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y libudev-dev libsqlite3-dev libopencv-dev libstrophe-dev libcamera-dev pkg-config
+    DEBIAN_FRONTEND=noninteractive apt-get install -y libopencv-dev
 
 
-# Create the image that will be used for crosscompilation
-FROM ubuntu:22.04
+# Create the image that will be used for cross-compilation
+FROM ubuntu:24.04
 
 COPY --from=1 / /rpi-root
 
@@ -59,28 +68,31 @@ RUN set -xeu && \
     apt-get -y autoclean
 
 RUN set -xeu && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y clang libclang-dev lld curl git build-essential pkg-config cmake
+    DEBIAN_FRONTEND=noninteractive apt-get install -y clang libclang-dev lld curl git build-essential cmake
 
 RUN set -xeu && \
     curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile=minimal && \
     rm -rf /root/.rustup/tmp/* # warning: could not delete temp directory: /root/.rustup/tmp/szyc3h06vricp83o_dir
 
-RUN set -xeu && \
-    echo "[net]\ngit-fetch-with-cli = true\n[target.arm-unknown-linux-gnueabihf]\nlinker = \"clang-rpi\"" > /root/.cargo/config
-
 ENV PATH="${PATH}:/root/.cargo/bin"
 
 RUN set -xeu && \
     rustup target add arm-unknown-linux-gnueabihf
 
+RUN set -xeu && \
+    echo "[target.arm-unknown-linux-gnueabihf]\nlinker = \"clang-rpi\"" > /root/.cargo/config.toml
+
 RUN echo '#!/bin/bash\n\
 RPI_ROOT="/rpi-root"\n\
-clang --target=arm-unknown-linux-gnueabihf -fuse-ld=lld --sysroot="$RPI_ROOT" --gcc-toolchain="$RPI_ROOT" "$@"' > /usr/local/bin/clang-rpi && chmod +x /usr/local/bin/clang-rpi
+clang --target=arm-unknown-linux-gnueabihf -fuse-ld=lld --sysroot="$RPI_ROOT" --gcc-install-dir="$RPI_ROOT/usr/lib/gcc/arm-linux-gnueabihf/14" -Wl,-z,notext -Wno-unused-command-line-argument "$@"' > /usr/local/bin/clang-rpi && \
+    chmod +x /usr/local/bin/clang-rpi
 
 RUN echo '#!/bin/bash\n\
 RPI_ROOT="/rpi-root"\n\
-export PKG_CONFIG_SYSROOT_DIR="$RPI_ROOT"\n\
-export PKG_CONFIG_LIBDIR="$RPI_ROOT/usr/lib/arm-linux-gnueabihf/pkgconfig"\n\
-export CC="clang-rpi"\n\
-export CXX="clang-rpi"\n\
+export OpenCV_DIR="$RPI_ROOT/usr/lib/arm-linux-gnueabihf/cmake"\n\
+export CC_arm_unknown_linux_gnueabihf=clang-rpi\n\
+export CXX_arm_unknown_linux_gnueabihf=clang-rpi\n\
+export CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_LINKER=clang-rpi\n\
+export BINDGEN_EXTRA_CLANG_ARGS_arm_unknown_linux_gnueabihf="--sysroot=${RPI_ROOT}"\n\
+export CMAKE_CROSSCOMPILING=TRUE\n\
 cargo build -vv --target arm-unknown-linux-gnueabihf' > /usr/local/bin/cargo-xbuild && chmod +x /usr/local/bin/cargo-xbuild

…buntu-22.04-opencv-full-build.Dockerfile …buntu-24.04-opencv-full-build.Dockerfiletools/docker/ubuntu-22.04-opencv-full-build.Dockerfile renamed to tools/docker/ubuntu-24.04-opencv-full-build.Dockerfile tools/docker/ubuntu-22.04-opencv-full-build.Dockerfile renamed to tools/docker/ubuntu-24.04-opencv-full-build.Dockerfile

@@ -1,6 +1,6 @@
-# Ubuntu 22.04 container builds OpenCV from source with the maximum possible enabled amount of features
+# Ubuntu 24.04 container builds OpenCV from source with the maximum possible enabled amount of features
 
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 RUN set -xeu && \
     apt-get update && \
@@ -9,29 +9,60 @@ RUN set -xeu && \
     apt-get -y autoclean
 
 RUN set -xeu && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y curl clang libclang-dev \
-    cmake python3-numpy libatlas-base-dev libceres-dev libeigen3-dev liblapacke-dev libprotobuf-dev protobuf-compiler nvidia-cuda-dev libtesseract-dev \
-    libwebp-dev libpng-dev libtiff-dev libopenexr-dev libgdal-dev libopenjp2-7-dev libopenjpip-server libopenjpip-dec-server libopenjp2-tools libhdf5-dev \
-    libavcodec-dev libavformat-dev libavutil-dev  libgphoto2-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libva-dev libdc1394-dev \
-    libfreetype6-dev libharfbuzz-dev qtbase5-dev libvtk9-dev libogre-1.12-dev
+    DEBIAN_FRONTEND=noninteractive apt-get install -y \
+    clang \
+    cmake \
+    curl \
+    libatlas-base-dev \
+    libavcodec-dev \
+    libavformat-dev \
+    libavutil-dev \
+    libceres-dev \
+    libclang-dev \
+    libdc1394-dev \
+    libeigen3-dev \
+    libfreetype6-dev \
+    libgdal-dev \
+    libgphoto2-dev \
+    libgstreamer-plugins-base1.0-dev \
+    libgstreamer1.0-dev \
+    libharfbuzz-dev \
+    libhdf5-dev \
+    liblapacke64-dev \
+    libogre-1.12-dev \
+    libopenexr-dev \
+    libopenjp2-7-dev \
+    libopenjp2-tools \
+    libopenjpip-dec-server \
+    libopenjpip-server \
+    libpng-dev \
+    libprotobuf-dev \
+    libtesseract-dev \
+    libtiff-dev \
+    libva-dev \
+    libvtk9-dev \
+    libwebp-dev \
+    nvidia-cuda-dev \
+    protobuf-compiler \
+    python3-numpy \
+    qtbase5-dev
 
 RUN set -xeu && \
     curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile=minimal
 
 ENV PATH="${PATH}:/root/.cargo/bin"
 
-ARG OPENCV_VERSION=4.8.0
+ARG OPENCV_VERSION=4.11.0
 
 RUN set -xeu && \
     mkdir -p /root/dist && \
     curl -sSfL "https://github.com/opencv/opencv/archive/refs/tags/${OPENCV_VERSION}.tar.gz" | tar xz -C /root/dist && \
-    curl -sSfL "https://github.com/opencv/opencv_contrib/archive/refs/tags/${OPENCV_VERSION}.tar.gz" | tar xz -C /root/dist && \
-    sed -ri 's/Ptr<FarnebackOpticalFlow> cv::cuda::FarnebackOpticalFlow::create/Ptr<cv::cuda::FarnebackOpticalFlow> cv::cuda::FarnebackOpticalFlow::create/' "/root/dist/opencv_contrib-${OPENCV_VERSION}/modules/cudaoptflow/src/farneback.cpp" # patch for version 4.8.0
+    curl -sSfL "https://github.com/opencv/opencv_contrib/archive/refs/tags/${OPENCV_VERSION}.tar.gz" | tar xz -C /root/dist
 
 RUN set -xeu && \
     mkdir -p /root/build && \
     cmake -B /root/build -S "/root/dist/opencv-${OPENCV_VERSION}" -D OPENCV_EXTRA_MODULES_PATH="/root/dist/opencv_contrib-${OPENCV_VERSION}/modules" -D CMAKE_INSTALL_PREFIX=/usr \
-    	-D BUILD_CUDA_STUBS=ON \
+    	-D BUILD_CUDA_STUBS=OFF \
     	-D BUILD_DOCS=OFF \
     	-D BUILD_EXAMPLES=OFF \
     	-D BUILD_IPP_IW=ON \

…er/ubuntu-22.04-opencv-system.Dockerfile …er/ubuntu-24.04-opencv-system.Dockerfiletools/docker/ubuntu-22.04-opencv-system.Dockerfile renamed to tools/docker/ubuntu-24.04-opencv-system.Dockerfile tools/docker/ubuntu-22.04-opencv-system.Dockerfile renamed to tools/docker/ubuntu-24.04-opencv-system.Dockerfile

@@ -1,6 +1,6 @@
-# Straghtforward Ubuntu 22.04 container that uses system OpenCV
+# Straghtforward Ubuntu 24.04 container that uses system OpenCV
 
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 RUN set -xeu && \
     apt-get update && \