diff --git a/Dockerfile b/Dockerfile index 77aeb11..6a4aec3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ -#FROM ubuntu:20.04 FROM nvidia/opengl:1.2-glvnd-devel-ubuntu20.04 ENV DEBIAN_FRONTEND noninteractive ENV NVIDIA_VISIBLE_DEVICES all ENV NVIDIA_DRIVER_CAPABILITIES graphics,utility,compute - +ENV LD_LIBRARY_PATH=/usr/lib/wsl/lib +ENV LIBVA_DRIVER_NAME=d3d12 ARG CODE_DIR=/usr/local/src RUN apt update @@ -85,6 +85,32 @@ RUN cd $CODE_DIR && \ EXPOSE 10000/tcp 10000/udp RUN yarp check +# dv-processing +# Add toolchain PPA and install gcc-13/g++-13 +RUN apt update && \ + apt install -y software-properties-common && \ + add-apt-repository ppa:ubuntu-toolchain-r/test && \ + apt update && \ + apt install -y gcc-13 g++-13 + +# Add inivation PPA and install dv-processing dependencies +RUN add-apt-repository ppa:inivation-ppa/inivation && \ + apt-get update && \ + apt-get install -y \ + boost-inivation \ + libcaer-dev \ + libfmt-dev \ + liblz4-dev \ + libzstd-dev \ + libssl-dev && \ + apt-get -y install dv-processing + +ENV CC=gcc-13 +ENV CXX=g++-13 +ENV BOOST_ROOT=/opt/inivation/boost +ENV BOOST_INCLUDEDIR=/opt/inivation/boost/include +ENV BOOST_LIBRARYDIR=/opt/inivation/boost/lib + # event-driven ARG ED_VERSION=main diff --git a/docker-compose.yaml b/docker-compose.yaml index 9c11d84..45d113a 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,14 +1,18 @@ services: - edopt: + testedopt: image: edopt:latest container_name: edopt privileged: true + environment: + - DISPLAY=${DISPLAY} + - XDG_RUNTIME_DIR=${XDG_RUNTIME_DIR} volumes: - /dev/bus/usb:/dev/bus/usb - - /tmp/.X11-unix/:/tmp/.X11-unix - environment: - - DISPLAY=unix$DISPLAY + - /tmp/.X11-unix:/tmp/.X11-unix + - /usr/lib/wsl:/usr/lib/wsl network_mode: host + devices: + - /dev/dxg:/dev/dxg deploy: resources: reservations: @@ -16,4 +20,5 @@ services: - driver: nvidia count: all capabilities: [gpu] - command: sleep infinity \ No newline at end of file + stdin_open: true + tty: true \ No newline at end of file