diff --git a/build_config/build_req_deb.txt b/build_config/build_req_deb.txt index aa3e4c6075a..ea62e07b2ef 100644 --- a/build_config/build_req_deb.txt +++ b/build_config/build_req_deb.txt @@ -24,7 +24,9 @@ pipx plantuml pre-commit python-is-python3 +python3-build python3-dev +python3-pip python3-setuptools swig xvfb diff --git a/build_config/docker/Dockerfile.ubuntu.git b/build_config/docker/Dockerfile.ubuntu.git index a7c8599fe02..d891ad04dc6 100644 --- a/build_config/docker/Dockerfile.ubuntu.git +++ b/build_config/docker/Dockerfile.ubuntu.git @@ -11,6 +11,7 @@ FROM ubuntu:jammy ENV SUMO_HOME=/usr/share/sumo ARG DEBIAN_FRONTEND=noninteractive +ARG JUPEDSIM_VERSION=v1.2.1 RUN apt-get -y update RUN apt-get -y install git @@ -24,6 +25,11 @@ RUN apt-get -y install libopenscenegraph-dev libavformat-dev libswscale-dev # packages needed for the tools (some are also listed in tools/requirements.txt but we prefer the ubuntu packages) RUN apt-get -y install $(cat /opt/sumo/build_config/tools_req_deb.txt) +# JuPedSim +RUN cd /opt; git clone -b $JUPEDSIM_VERSION https://github.com/PedestrianDynamics/jupedsim +RUN cd /opt; cmake -B jupedsim-build -D CMAKE_INSTALL_PREFIX=jupedsim-install jupedsim; \ + cmake --build jupedsim-build -j4 --config Release; cmake --install jupedsim-build --config Release; rm -rf jupedsim-build + # python packages needed for the tools (the ones where we do not have ubuntu packages) RUN pip3 install -r /opt/sumo/tools/requirements.txt # python packages needed for the docs (the ones where we do not have ubuntu packages)