From 723da2c26b8aa583fe61d3361d375253c560e7ad Mon Sep 17 00:00:00 2001 From: ruffsl Date: Fri, 16 Oct 2020 11:25:34 -0700 Subject: [PATCH 1/2] Repatch eloquent --- ros/eloquent/ubuntu/bionic/images.yaml.em | 7 +++++++ ros/eloquent/ubuntu/bionic/ros1-bridge/Dockerfile | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/ros/eloquent/ubuntu/bionic/images.yaml.em b/ros/eloquent/ubuntu/bionic/images.yaml.em index adf44f7ca..a2d69fad4 100644 --- a/ros/eloquent/ubuntu/bionic/images.yaml.em +++ b/ros/eloquent/ubuntu/bionic/images.yaml.em @@ -43,3 +43,10 @@ images: - ros-comm - roscpp-tutorials - rospy-tutorials + downstream_packages: + # The Python 3 version of rosdep get uninstalled when installign ROS 1 + # We install the Python 2 version manually to not conflict and allow consumers to use the CLI tool + - python-rosdep + # Currently not side-by-side installable with python2 version + # https://github.com/ros-infrastructure/rosdep/issues/759 + # - python3-rosdep-modules diff --git a/ros/eloquent/ubuntu/bionic/ros1-bridge/Dockerfile b/ros/eloquent/ubuntu/bionic/ros1-bridge/Dockerfile index 1834593bc..0a47b36a8 100644 --- a/ros/eloquent/ubuntu/bionic/ros1-bridge/Dockerfile +++ b/ros/eloquent/ubuntu/bionic/ros1-bridge/Dockerfile @@ -35,6 +35,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ ros-eloquent-demo-nodes-py=0.8.4-1* \ && rm -rf /var/lib/apt/lists/* +# install downstream packages +RUN apt-get update && apt-get install -y --no-install-recommends \ + python-rosdep \ + && rm -rf /var/lib/apt/lists/* + # setup entrypoint COPY ./ros_entrypoint.sh / From ee399e4042938fd811107aa9a8fc969b99b9e6d3 Mon Sep 17 00:00:00 2001 From: ruffsl Date: Fri, 16 Oct 2020 11:30:21 -0700 Subject: [PATCH 2/2] Update manifest --- ros/ros | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ros/ros b/ros/ros index c04095fc2..0c98dac10 100644 --- a/ros/ros +++ b/ros/ros @@ -168,7 +168,7 @@ Directory: ros/eloquent/ubuntu/bionic/ros-base Tags: eloquent-ros1-bridge, eloquent-ros1-bridge-bionic Architectures: amd64, arm32v7, arm64v8 -GitCommit: 421722cdc4b6b3fa5ec3697f851130435454a059 +GitCommit: 723da2c26b8aa583fe61d3361d375253c560e7ad Directory: ros/eloquent/ubuntu/bionic/ros1-bridge