From cf992c16e3bccfd79b43b1304e7c6fead68af77c Mon Sep 17 00:00:00 2001 From: Fabian Immel Date: Mon, 12 Feb 2024 20:13:29 +0100 Subject: [PATCH] move to correct dockerfile --- .github/conan_dockerfile/Dockerfile | 3 ++- Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/conan_dockerfile/Dockerfile b/.github/conan_dockerfile/Dockerfile index d8d38c7e..d670fbc6 100644 --- a/.github/conan_dockerfile/Dockerfile +++ b/.github/conan_dockerfile/Dockerfile @@ -14,7 +14,8 @@ RUN sudo -E apt-get update \ ARG PY_VERSION=3.8 RUN pyenv install -s $PY_VERSION \ && pyenv global $PY_VERSION -RUN pip install "conan==1.59.0" catkin_pkg numpy wheel auditwheel cmake +RUN pip install "conan==1.59.0" catkin_pkg oldest-supported-numpy wheel auditwheel cmake +# oldest-supported-numpy for ABI compatibility # install patchelf RUN wget https://github.com/NixOS/patchelf/releases/download/0.17.2/patchelf-0.17.2-x86_64.tar.gz \ diff --git a/Dockerfile b/Dockerfile index c7197e18..62a084f8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -73,8 +73,8 @@ RUN if [ "${ROS_DISTRO}" = "melodic" ] || [ "${ROS_DISTRO}" = "kinetic" ]; \ apt-get clean && \ rm -rf /var/lib/apt/lists/* -# install python dependencies (oldest-supported-numpy for ABI compatibility) -RUN pip install oldest-supported-numpy +# install python dependencies (numpy) +RUN pip install numpy # ros version specific dependencies RUN set -ex; \