Skip to content

Commit e6574d3

Browse files
Ar-Ray-codeAr-Ray-code
committed
update for ros2 version for dockerfile
1 parent f50d05c commit e6574d3

7 files changed

Lines changed: 38 additions & 61 deletions

File tree

‎yolox_ros_cpp/docker/onnxruntime/dockerfile‎

Lines changed: 11 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG BASE_TAG=11.4.2-cudnn8-devel-ubuntu20.04
1+
ARG BASE_TAG=12.2.0-devel-ubuntu22.04
22
FROM nvcr.io/nvidia/cuda:${BASE_TAG}
33
ENV DEBIAN_FRONTEND=noninteractive
44

@@ -39,41 +39,25 @@ RUN apt update && apt install locales && \
3939
ENV LANG=en_US.UTF-8
4040

4141
RUN apt update && \
42-
apt install -y curl gnupg2 lsb-release && \
43-
curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key -o /usr/share/keyrings/ros-archive-keyring.gpg && \
42+
apt install -y git wget curl gnupg2 lsb-release && \
43+
curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key -o /usr/share/keyrings/ros-archive-keyring.gpg && \
4444
echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/ros-archive-keyring.gpg] http://packages.ros.org/ros2/ubuntu $(lsb_release -cs) main" | tee /etc/apt/sources.list.d/ros2.list > /dev/null && \
45-
sed -i -e 's/ubuntu .* main/ubuntu focal main/g' /etc/apt/sources.list.d/ros2.list && \
45+
sed -i -e 's/ubuntu .* main/ubuntu jammy main/g' /etc/apt/sources.list.d/ros2.list && \
4646
apt update && \
47-
apt install -y ros-foxy-ros-base \
48-
python3-colcon-common-extensions \
49-
ros-foxy-v4l2-camera \
50-
ros-foxy-cv-bridge \
51-
ros-foxy-rqt-graph \
52-
ros-foxy-rqt-image-view && \
53-
rm -rf /var/lib/apt/lists/* &&\
47+
apt install -y ros-humble-ros-base \
48+
ros-humble-v4l2-camera \
49+
ros-humble-cv-bridge \
50+
ros-humble-rqt-image-view \
51+
ros-humble-parameter-traits \
52+
ros-dev-tools && \
5453
apt -y clean && \
54+
rm -rf /var/lib/apt/lists/* && \
5555
pip install -U pip && \
5656
pip install catkin_pkg && \
5757
pip install empy && \
5858
pip install lark && \
5959
python3 -m pip cache purge
6060

61-
WORKDIR /workdir
62-
ENV YOLOX_VERSION=0.3.0
63-
RUN git clone --depth 1 https://github.com/Megvii-BaseDetection/YOLOX -b $YOLOX_VERSION && \
64-
cd YOLOX && \
65-
# python3 -m pip install -r requirements.txt && \
66-
python3 -m pip install -U numpy \
67-
torch>=1.7 \
68-
opencv_python \
69-
loguru \
70-
tqdm \
71-
torchvision \
72-
thop \
73-
ninja \
74-
tabulate && \
75-
python3 -m pip install --no-deps . && \
76-
python3 -m pip cache purge
7761

7862
COPY ./ros_entrypoint.sh /ros_entrypoint.sh
7963
RUN echo "source /ros_entrypoint.sh" >> /root/.bashrc

‎yolox_ros_cpp/docker/onnxruntime/ros_entrypoint.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/bash
2-
source /opt/ros/foxy/setup.bash
2+
source /opt/ros/humble/setup.bash
33
source /usr/share/colcon_argcomplete/hook/colcon-argcomplete.bash

‎yolox_ros_cpp/docker/openvino/docker-compose.yaml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
version: '3.4'
22
services:
3-
yolox_ros:
3+
yolox_ros_openvino:
44
container_name: yolox_openvino
5-
# build:
6-
# context: .
7-
image: fateshelled/openvino_yolox_ros:latest
5+
build:
6+
context: .
87
network_mode: host
98
environment:
109
- DISPLAY=$DISPLAY
1110
volumes:
12-
- $HOME/ros2_ws:/root/ros2_ws
11+
- ../../../:/root/ros2_ws/src
1312
- /tmp/.X11-unix:/tmp/.X11-unix
1413
devices:
1514
- "/dev/video0:/dev/video0"

‎yolox_ros_cpp/docker/openvino/dockerfile‎

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,26 @@
1-
FROM openvino/ubuntu20_dev:2021.4.1_20210416
1+
FROM openvino/ubuntu22_dev:2023.0.1
22

33
ENV DEBIAN_FRONTEND=noninteractive
44

55
USER root
66

7-
RUN python3 -m pip install --no-cache-dir -U pip && \
8-
python3 -m pip install --no-cache-dir cmake && \
9-
python3 -m pip install --no-cache-dir -r /opt/intel/openvino/deployment_tools/model_optimizer/requirements.txt
10-
117
# Install ROS2
128
RUN apt update && \
139
apt install -y git wget curl gnupg2 lsb-release && \
14-
curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key -o /usr/share/keyrings/ros-archive-keyring.gpg && \
10+
curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key -o /usr/share/keyrings/ros-archive-keyring.gpg && \
1511
echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/ros-archive-keyring.gpg] http://packages.ros.org/ros2/ubuntu $(lsb_release -cs) main" | tee /etc/apt/sources.list.d/ros2.list > /dev/null && \
16-
sed -i -e 's/ubuntu .* main/ubuntu focal main/g' /etc/apt/sources.list.d/ros2.list && \
12+
sed -i -e 's/ubuntu .* main/ubuntu jammy main/g' /etc/apt/sources.list.d/ros2.list && \
1713
apt update && \
18-
apt install -y ros-foxy-ros-base \
19-
ros-foxy-v4l2-camera \
20-
ros-foxy-cv-bridge \
21-
ros-foxy-rqt-graph \
22-
ros-foxy-rqt-image-view && \
23-
apt install -y python3-colcon-common-extensions && \
14+
apt install -y ros-humble-ros-base \
15+
ros-humble-v4l2-camera \
16+
ros-humble-cv-bridge \
17+
ros-humble-rqt-image-view \
18+
ros-humble-parameter-traits \
19+
ros-dev-tools && \
2420
apt -y clean && \
2521
rm -rf /var/lib/apt/lists/*
2622

2723
WORKDIR /workspace
28-
ENV YOLOX_VERSION=0.2.0
29-
RUN git clone https://github.com/Megvii-BaseDetection/YOLOX -b $YOLOX_VERSION && \
30-
cd YOLOX && \
31-
python3 -m pip install --no-cache-dir -r requirements.txt && \
32-
python3 setup.py install
33-
3424
COPY ./ros_entrypoint.sh /ros_entrypoint.sh
3525
RUN echo "source /ros_entrypoint.sh" >> /root/.bashrc
3626
# RUN echo "source /opt/intel/openvino/bin/setupvars.sh " >> /root/.bashrc

‎yolox_ros_cpp/docker/openvino/ros_entrypoint.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
#!/bin/bash
2-
source /opt/ros/foxy/setup.bash
2+
source /opt/ros/humble/setup.bash
33
source /usr/share/colcon_argcomplete/hook/colcon-argcomplete.bash
4+

‎yolox_ros_cpp/docker/tensorrt/dockerfile‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,18 @@ RUN apt update && apt install locales && \
1111
ENV LANG=en_US.UTF-8
1212

1313
RUN apt update && \
14-
apt install -y curl gnupg2 lsb-release && \
15-
curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key -o /usr/share/keyrings/ros-archive-keyring.gpg && \
14+
apt install -y git wget curl gnupg2 lsb-release && \
15+
curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key -o /usr/share/keyrings/ros-archive-keyring.gpg && \
1616
echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/ros-archive-keyring.gpg] http://packages.ros.org/ros2/ubuntu $(lsb_release -cs) main" | tee /etc/apt/sources.list.d/ros2.list > /dev/null && \
17-
sed -i -e 's/ubuntu .* main/ubuntu focal main/g' /etc/apt/sources.list.d/ros2.list && \
17+
sed -i -e 's/ubuntu .* main/ubuntu jammy main/g' /etc/apt/sources.list.d/ros2.list && \
1818
apt update && \
19-
apt install -y ros-foxy-ros-base && \
20-
apt install -y python3-colcon-common-extensions && \
21-
apt install -y ros-foxy-v4l2-camera && \
22-
apt install -y ros-foxy-cv-bridge &&\
19+
apt install -y ros-humble-ros-base \
20+
ros-humble-v4l2-camera \
21+
ros-humble-cv-bridge \
22+
ros-humble-rqt-image-view \
23+
ros-humble-parameter-traits \
24+
ros-dev-tools && \
25+
apt -y clean && \
2326
rm -rf /var/lib/apt/lists/* &&\
2427
apt -y clean && \
2528
pip install -U pip && \

‎yolox_ros_cpp/docker/tensorrt/ros_entrypoint.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/bash
2-
source /opt/ros/foxy/setup.bash
2+
source /opt/ros/humble/setup.bash
33
source /usr/share/colcon_argcomplete/hook/colcon-argcomplete.bash

0 commit comments

Comments
 (0)