Skip to content

Commit b02ce5d

Browse files
wrong dockerfile
1 parent c9975d4 commit b02ce5d

File tree

4 files changed

+32
-32
lines changed

4 files changed

+32
-32
lines changed

ROS2/AMD64x86/humble_harmonic/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/smart-wheelchair-rrc/humble_gpu:dev4.10.1
1+
FROM ghcr.io/smart-wheelchair-rrc/humble_gpu:dev4.10.2
22

33
ARG USERNAME=container_user
44

ROS2/AMD64x86/wheelchair2_base/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/smart-wheelchair-rrc/humble:dev4.10.1
1+
FROM ghcr.io/smart-wheelchair-rrc/humble:dev4.10.2
22

33
ARG USERNAME=container_user
44

ROS2/AMD64x86/wheelchair2_base_gazebo/Dockerfile

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/smart-wheelchair-rrc/humble_harmonic:dev4.10.1
1+
FROM ghcr.io/smart-wheelchair-rrc/humble_harmonic:dev4.10.2
22

33
ARG USERNAME=container_user
44

@@ -59,11 +59,39 @@ RUN cd Livox-SDK2 \
5959
&& cmake .. && make -j \
6060
&& sudo make install
6161

62+
RUN sudo bash -c 'wget https://raw.githubusercontent.com/osrf/osrf-rosdep/master/gz/00-gazebo.list -O /etc/ros/rosdep/sources.list.d/00-gazebo.list' \
63+
&& rosdep update \
64+
&& rosdep resolve gz-harmonic
65+
6266
COPY rosPkgs.list /tmp/rosPkgs.list
6367
RUN sudo apt-get update \
6468
&& sudo apt-get -y install --no-install-recommends $(cat /tmp/rosPkgs.list) \
6569
&& sudo rm -rf /var/lib/apt/lists/*
6670

71+
WORKDIR /home/$USERNAME/gz_ros2_control_ws/src
72+
RUN git clone --depth=1 --progress --verbose https://github.com/ros-controls/gz_ros2_control -b $ROS_DISTRO . \
73+
&& export GZ_VERSION=harmonic \
74+
&& rosdep install -r --from-paths . --ignore-src --rosdistro $ROS_DISTRO -y --skip-keys="ros_gz_bridge ros_gz_sim"
75+
76+
WORKDIR /home/$USERNAME/gz_ros2_control_ws
77+
RUN source /opt/ros/$ROS_DISTRO/setup.bash \
78+
&& colcon build \
79+
&& echo "source ~/gz_ros2_control_ws/install/setup.bash" | sudo tee -a ~/.bashrc > /dev/null
80+
81+
RUN sudo mkdir -p /opt/nvidia/
82+
COPY NVIDIA-OptiX-SDK-7.2.0-linux64-x86_64/ /opt/nvidia/NVIDIA-OptiX-SDK-7.2.0-linux64-x86_64/
83+
ENV OptiX_INSTALL_DIR=/opt/nvidia/NVIDIA-OptiX-SDK-7.2.0-linux64-x86_64/
84+
85+
WORKDIR /home/$USERNAME
86+
RUN git clone --depth=1 --progress --verbose https://github.com/RobotecAI/RGLGazeboPlugin.git \
87+
&& cd RGLGazeboPlugin \
88+
&& mkdir build && cd build \
89+
&& cmake .. && sudo make -j && sudo make install
90+
91+
# Environment variable for RGLGazeboPlugin
92+
ENV GZ_GUI_PLUGIN_PATH=/home/$USERNAME/RGLGazeboPlugin/install/RGLVisualize
93+
ENV GZ_SIM_SYSTEM_PLUGIN_PATH=/home/$USERNAME/RGLGazeboPlugin/install/RGLServerPlugin
94+
ENV RGL_PATTERNS_DIR=/home/$USERNAME/RGLGazeboPlugin/lidar_patterns
6795

6896
COPY pythonPkgs.list /tmp/pythonPkgs.list
6997
RUN sudo apt-get update \

ROS2/AMD64x86/wheelchair2_base_gpu/Dockerfile

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/smart-wheelchair-rrc/humble_gpu:dev4.10.1
1+
FROM ghcr.io/smart-wheelchair-rrc/humble_gpu:dev4.10.2
22

33
ARG USERNAME=container_user
44

@@ -59,39 +59,11 @@ RUN cd Livox-SDK2 \
5959
&& cmake .. && make -j \
6060
&& sudo make install
6161

62-
RUN sudo bash -c 'wget https://raw.githubusercontent.com/osrf/osrf-rosdep/master/gz/00-gazebo.list -O /etc/ros/rosdep/sources.list.d/00-gazebo.list' \
63-
&& rosdep update \
64-
&& rosdep resolve gz-harmonic
65-
6662
COPY rosPkgs.list /tmp/rosPkgs.list
6763
RUN sudo apt-get update \
6864
&& sudo apt-get -y install --no-install-recommends $(cat /tmp/rosPkgs.list) \
6965
&& sudo rm -rf /var/lib/apt/lists/*
7066

71-
WORKDIR /home/$USERNAME/gz_ros2_control_ws/src
72-
RUN git clone --depth=1 --progress --verbose https://github.com/ros-controls/gz_ros2_control -b $ROS_DISTRO . \
73-
&& export GZ_VERSION=harmonic \
74-
&& rosdep install -r --from-paths . --ignore-src --rosdistro $ROS_DISTRO -y --skip-keys="ros_gz_bridge ros_gz_sim"
75-
76-
WORKDIR /home/$USERNAME/gz_ros2_control_ws
77-
RUN source /opt/ros/$ROS_DISTRO/setup.bash \
78-
&& colcon build \
79-
&& echo "source ~/gz_ros2_control_ws/install/setup.bash" | sudo tee -a ~/.bashrc > /dev/null
80-
81-
RUN sudo mkdir -p /opt/nvidia/
82-
COPY NVIDIA-OptiX-SDK-7.2.0-linux64-x86_64/ /opt/nvidia/NVIDIA-OptiX-SDK-7.2.0-linux64-x86_64/
83-
ENV OptiX_INSTALL_DIR=/opt/nvidia/NVIDIA-OptiX-SDK-7.2.0-linux64-x86_64/
84-
85-
WORKDIR /home/$USERNAME
86-
RUN git clone --depth=1 --progress --verbose https://github.com/RobotecAI/RGLGazeboPlugin.git \
87-
&& cd RGLGazeboPlugin \
88-
&& mkdir build && cd build \
89-
&& cmake .. && sudo make -j && sudo make install
90-
91-
# Environment variable for RGLGazeboPlugin
92-
ENV GZ_GUI_PLUGIN_PATH=/home/$USERNAME/RGLGazeboPlugin/install/RGLVisualize
93-
ENV GZ_SIM_SYSTEM_PLUGIN_PATH=/home/$USERNAME/RGLGazeboPlugin/install/RGLServerPlugin
94-
ENV RGL_PATTERNS_DIR=/home/$USERNAME/RGLGazeboPlugin/lidar_patterns
9567

9668
COPY pythonPkgs.list /tmp/pythonPkgs.list
9769
RUN sudo apt-get update \

0 commit comments

Comments
 (0)