Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 28 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Comment on lines +5 to +6
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This part is for WSL system.
In my opinion, we don't need to prepare a docker environment for WSL users to simplify this repository.

Therefore, could you please delete this part to focus on Linux environments?

ARG CODE_DIR=/usr/local/src

RUN apt update
Expand Down Expand Up @@ -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

Comment on lines +88 to +113
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As I recommended you in event-driven repository Link, I can also recommend you to create some Dockerfiles to simplify environments.

Therefore, could you make them in the following folder structure?

EDOPT/
├── docker/
│   ├── Prophesee/
│            └── Dockerfile
│   ├── Inivation/
│            └── Dockerfile


# event-driven
ARG ED_VERSION=main
Expand Down
15 changes: 10 additions & 5 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,19 +1,24 @@
services:
edopt:
testedopt:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't need to change service name.

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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This part is also for WSL. Could you delete it not to contaminate the docker environment?

network_mode: host
devices:
- /dev/dxg:/dev/dxg
Comment on lines +14 to +15
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This part is also for WSL, so could you please delete it?

deploy:
resources:
reservations:
devices:
- driver: nvidia
count: all
capabilities: [gpu]
command: sleep infinity
stdin_open: true
tty: true
Comment on lines +23 to +24
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you just want to go inside docker container, you just do docker exec -it edopt /bin/bash.
Therefore, this modification is not required.
So, could you revert this part?