-
Notifications
You must be signed in to change notification settings - Fork 8
Updating docker files to support Inivation's DVXplorer Micro camera #17
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| 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 | ||
| 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 | ||
|
|
||
|
Comment on lines
+88
to
+113
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. As I recommended you in Therefore, could you make them in the following folder structure? |
||
|
|
||
| # event-driven | ||
| ARG ED_VERSION=main | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,24 @@ | ||
| services: | ||
| edopt: | ||
| testedopt: | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If you just want to go inside docker container, you just do |
||
There was a problem hiding this comment.
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?