Skip to content

Commit 424dd60

Browse files
authored
Rely on stable ROS 2 packages (#69)
* Rely on stable ROS 2 packages Signed-off-by: Yadunund <[email protected]> * Unrelated style fix Signed-off-by: Yadunund <[email protected]> --------- Signed-off-by: Yadunund <[email protected]>
1 parent 437e932 commit 424dd60

File tree

3 files changed

+5
-11
lines changed

3 files changed

+5
-11
lines changed

Dockerfile.estimator

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,8 @@ FROM base
5757
ARG SERVICE_PACKAGE=ibpc_pose_estimator_py
5858
ARG SERVICE_EXECUTABLE_NAME=ibpc_pose_estimator
5959

60-
RUN apt update \
61-
&& sudo apt install curl -y \
62-
&& curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key -o /usr/share/keyrings/ros-archive-keyring.gpg \
63-
&& echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/ros-archive-keyring.gpg] http://packages.ros.org/ros2-testing/ubuntu $(. /etc/os-release && echo $UBUNTU_CODENAME) main" | sudo tee /etc/apt/sources.list.d/ros2.list > /dev/null
64-
6560
RUN apt-get update \
61+
&& apt upgrade -y \
6662
&& apt install -y ros-jazzy-rmw-zenoh-cpp python3-imageio python3-png python3-pip python3-scipy \
6763
&& rm -rf /var/lib/apt/lists/*
6864

Dockerfile.tester

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,8 @@ RUN . /opt/ros/jazzy/setup.sh \
4141
# result stage: base + copied install folders from the overlay + service setup.
4242
FROM base
4343

44-
RUN apt update \
45-
&& sudo apt install curl -y \
46-
&& curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key -o /usr/share/keyrings/ros-archive-keyring.gpg \
47-
&& echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/ros-archive-keyring.gpg] http://packages.ros.org/ros2-testing/ubuntu $(. /etc/os-release && echo $UBUNTU_CODENAME) main" | sudo tee /etc/apt/sources.list.d/ros2.list > /dev/null
48-
4944
RUN apt-get update \
45+
&& apt upgrade -y \
5046
&& apt install -y ros-jazzy-rmw-zenoh-cpp python3-imageio python3-pandas python3-png python3-pip python3-scipy \
5147
&& rm -rf /var/lib/apt/lists/*
5248

ibpc_py/src/ibpc/ibpc.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,9 @@ def main():
278278
args_dict["name"] = ESTIMATOR_CONTAINER
279279
args_dict["network"] = "host"
280280
args_dict["extension_blacklist"] = ({},)
281-
args_dict["volume"] = [[f"{args_dict['dataset']}/models:/opt/ros/underlay/install/3d_models"], ]
281+
args_dict["volume"] = [
282+
[f"{args_dict['dataset']}/models:/opt/ros/underlay/install/3d_models"],
283+
]
282284
if not args_dict["no_gpu"]:
283285
args_dict["cuda"] = True
284286
args_dict["nvidia"] = True

0 commit comments

Comments
 (0)