Skip to content

Commit

Permalink
Merge branch 'main' into dev-gmacario
Browse files Browse the repository at this point in the history
  • Loading branch information
gmacario committed Sep 8, 2024
2 parents 59fedf2 + 0c482ba commit 3b81a8d
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions moveit2/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,9 @@ RUN python3 -m pip install -U \

# Get the MoveIt2 source code
WORKDIR ${HOME_DIR}
RUN sudo git clone https://github.com/ros-planning/moveit2.git -b ${ROSDISTRO} moveit2/src
RUN sudo git clone https://github.com/moveit/moveit2.git -b ${ROSDISTRO} moveit2/src
RUN cd ${MOVEIT2_DIR}/src \
&& sudo git clone https://github.com/ros-planning/moveit2_tutorials.git -b ${ROSDISTRO}
&& sudo git clone https://github.com/moveit/moveit2_tutorials.git -b ${ROSDISTRO}

# Update the ownership of the source files (had to use sudo above to work around
# a possible inherited 'insteadof' from the host that forces use of ssh
Expand Down
4 changes: 2 additions & 2 deletions moveit2/moveit2_tutorials.repos
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
repositories:
moveit_task_constructor:
type: git
url: https://github.com/ros-planning/moveit_task_constructor.git
url: https://github.com/moveit/moveit_task_constructor.git
version: humble
moveit_visual_tools:
type: git
url: https://github.com/ros-planning/moveit_visual_tools
url: https://github.com/moveit/moveit_visual_tools
version: ros2
rosparam_shortcuts:
type: git
Expand Down
2 changes: 1 addition & 1 deletion navigation2/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ ENV NAV2_DEPS_WS=${HOME_DIR}/nav2_deps_ws
RUN mkdir -p ${NAVIGATION2_WS}/src
WORKDIR ${NAVIGATION2_WS}/src
ARG NAV2_BRANCH=humble
RUN sudo git clone --branch $NAV2_BRANCH https://github.com/ros-planning/navigation2.git
RUN sudo git clone --branch $NAV2_BRANCH https://github.com/ros-navigation/navigation2.git

# Get keys for Nav2 dependencies
WORKDIR ${NAVIGATION2_WS}/
Expand Down
2 changes: 1 addition & 1 deletion navigation2/navigation2.repos
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ repositories:
version: rolling
map_msgs:
type: git
url: https://github.com/ros-planning/navigation_msgs.git
url: https://github.com/ros-navigation/navigation_msgs.git
version: rolling
ompl/ompl:
type: git
Expand Down
6 changes: 3 additions & 3 deletions renode_rcc/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ubuntu:20.04
WORKDIR /root
ENV DEBIAN_FRONTEND noninteractive
ENV DEBIAN_FRONTEND=noninteractive

# Using Docker BuildKit cache mounts for /var/cache/apt and /var/lib/apt ensures that
# the cache won't make it into the built image but will be maintained between steps.
Expand Down Expand Up @@ -36,9 +36,9 @@ WORKDIR /root/renode-rtems-leon3
RUN ./build-rtems.sh
RUN ./build-prom.sh
RUN mv rcc-1.3.0-gcc/ /opt/renode/
RUN mv grlib-gpl-2021.2-b4267 /opt/renode/
RUN mv grlib-gpl-2024.1-b4291 /opt/renode/

ENV PATH $PATH:/opt/renode/rcc-1.3.0-gcc/bin
ENV PATH=$PATH:/opt/renode/rcc-1.3.0-gcc/bin

WORKDIR /root
COPY config .config/renode/
Expand Down
2 changes: 1 addition & 1 deletion space_robots/demo_manual_pkgs.repos
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ repositories:
version: main
ros-humble-warehouse-ros-mongo:
type: git
url: https://github.com/ros-planning/warehouse_ros_mongo.git
url: https://github.com/moveit/warehouse_ros_mongo.git
version: ros2
vision_msgs:
type: git
Expand Down

0 comments on commit 3b81a8d

Please sign in to comment.