Skip to content
This repository is currently being migrated. It's locked while the migration is in progress.

Commit 659489c

Browse files
committed
Remove released upstream packages from docker files
As franka_description is released, we don't need to build it in our docker images anymore.
1 parent 8889901 commit 659489c

File tree

2 files changed

+0
-11
lines changed

2 files changed

+0
-11
lines changed

.docker/ci/Dockerfile

-8
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,6 @@ RUN \
2525
clang clang-format-10 clang-tidy clang-tools \
2626
ccache && \
2727
#
28-
# Build and install franka_description from https://github.com/frankaemika/franka_ros.git
29-
git clone --depth 1 --branch 0.6.0 https://github.com/frankaemika/franka_ros.git src/franka_ros && \
30-
mv src/franka_ros/franka_description src/ && rm -rf src/franka_ros && \
31-
catkin config --extend /opt/ros/noetic --install --install-space /opt/ros/noetic && \
32-
catkin build && \
33-
# Cleanup temporary workspace
34-
rm -rf logs build devel .catkin_tools && \
35-
#
3628
# Download MoveIt source, so that we can fetch all necessary dependencies
3729
wstool init --shallow src https://raw.githubusercontent.com/ros-planning/moveit/${ROS_DISTRO}-devel/moveit.rosinstall && \
3830
#

.docker/source/Dockerfile

-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ WORKDIR $ROS_UNDERLAY/../src
1212
RUN \
1313
# Download moveit source so that we can get necessary dependencies
1414
wstool init . https://raw.githubusercontent.com/ros-planning/moveit/${ROS_DISTRO}-devel/moveit.rosinstall && \
15-
# We only depend on franka_description (TODO: remove if released)
16-
git clone --depth 1 --branch 0.6.0 https://github.com/frankaemika/franka_ros.git src/franka_ros && \
17-
mv src/franka_ros/franka_description src/ && rm -rf src/franka_ros && \
1815
#
1916
# Update apt package list as cache is cleared in previous container
2017
# Usually upgrading involves a few packages only (if container builds became out-of-sync)

0 commit comments

Comments
 (0)