From 207215b28e523ed77d6658480d2046a26c620c4b Mon Sep 17 00:00:00 2001 From: KeVteL Date: Fri, 24 Jan 2025 08:40:24 +0100 Subject: [PATCH] Added python/pybind11 dependencies to dockerfiles This is necessary for the dockerfiles to build properly with the python-wrapper as part of the building process. Signed-off-by: Kevin Vu te Laar --- packaging/docker/Dockerfile.debian | 5 ++++- packaging/docker/Dockerfile.debian-multiarch | 5 ++++- packaging/docker/Dockerfile.fedora | 3 ++- packaging/docker/Dockerfile.fedora-minimal | 4 +++- packaging/docker/Dockerfile.rocky | 6 ++++-- packaging/docker/Dockerfile.ubuntu | 5 ++++- 6 files changed, 21 insertions(+), 7 deletions(-) diff --git a/packaging/docker/Dockerfile.debian b/packaging/docker/Dockerfile.debian index b9fcb9801..cabba1798 100644 --- a/packaging/docker/Dockerfile.debian +++ b/packaging/docker/Dockerfile.debian @@ -51,7 +51,10 @@ RUN apt-get update && \ liblua5.3-dev \ libhiredis-dev \ libnice-dev \ - libmodbus-dev + libmodbus-dev \ + python3 \ + python3-dev \ + python3-pybind11 # Add local and 64-bit locations to linker paths ENV echo /usr/local/lib >> /etc/ld.so.conf && \ diff --git a/packaging/docker/Dockerfile.debian-multiarch b/packaging/docker/Dockerfile.debian-multiarch index 1c07499db..660fd3a97 100644 --- a/packaging/docker/Dockerfile.debian-multiarch +++ b/packaging/docker/Dockerfile.debian-multiarch @@ -58,7 +58,10 @@ RUN apt-get update && \ libusb-1.0-0-dev:${ARCH} \ liblua5.3-dev:${ARCH} \ libhiredis-dev:${ARCH} \ - libmodbus-dev:${ARCH} + libmodbus-dev:${ARCH} \ + python3:${ARCH} \ + python3-dev:${ARCH} \ + python3-pybind11:${ARCH} # Add local and 64-bit locations to linker paths ENV echo /usr/local/lib >> /etc/ld.so.conf && \ diff --git a/packaging/docker/Dockerfile.fedora b/packaging/docker/Dockerfile.fedora index d28802f2c..3775aa159 100644 --- a/packaging/docker/Dockerfile.fedora +++ b/packaging/docker/Dockerfile.fedora @@ -64,7 +64,8 @@ RUN dnf -y install \ lua-devel \ hiredis-devel \ libnice-devel \ - libmodbus-devel + libmodbus-devel \ + pybind11-devel # Add local and 64-bit locations to linker paths RUN echo /usr/local/lib >> /etc/ld.so.conf && \ diff --git a/packaging/docker/Dockerfile.fedora-minimal b/packaging/docker/Dockerfile.fedora-minimal index 6af3e6722..768fd1248 100644 --- a/packaging/docker/Dockerfile.fedora-minimal +++ b/packaging/docker/Dockerfile.fedora-minimal @@ -18,13 +18,15 @@ RUN dnf -y install \ # Dependencies RUN dnf -y install \ + python python-devel \ openssl-devel \ libuuid-devel \ libcurl-devel \ jansson-devel \ spdlog-devel \ fmt-devel \ - libwebsockets-devel + libwebsockets-devel \ + pybind11-devel ENV LC_ALL C.UTF-8 ENV LANG C.UTF-8 diff --git a/packaging/docker/Dockerfile.rocky b/packaging/docker/Dockerfile.rocky index 96b2cd9f6..5d8ab7f8d 100644 --- a/packaging/docker/Dockerfile.rocky +++ b/packaging/docker/Dockerfile.rocky @@ -25,7 +25,8 @@ RUN dnf --allowerasing -y install \ flex bison \ texinfo git curl tar \ protobuf-compiler protobuf-c-compiler \ - clang-tools-extra + clang-tools-extra \ + python python-devel # Dependencies RUN dnf -y install \ @@ -48,7 +49,8 @@ RUN dnf -y install \ lua-devel \ hiredis-devel \ libnice-devel \ - libmodbus-devel + libmodbus-devel \ + pybind11-devel # Add local and 64-bit locations to linker paths ENV echo /usr/local/lib >> /etc/ld.so.conf && \ diff --git a/packaging/docker/Dockerfile.ubuntu b/packaging/docker/Dockerfile.ubuntu index 38f660350..39c975298 100644 --- a/packaging/docker/Dockerfile.ubuntu +++ b/packaging/docker/Dockerfile.ubuntu @@ -53,7 +53,10 @@ RUN apt-get update && \ liblua5.3-dev \ libhiredis-dev \ libnice-dev \ - libmodbus-dev + libmodbus-dev \ + python3 \ + python3-dev \ + python3-pybind11 # Add local and 64-bit locations to linker paths ENV echo /usr/local/lib >> /etc/ld.so.conf && \