Skip to content

Commit 953bf2b

Browse files
authored
Merge branch 'main' into aws-ws-cpu
2 parents ec163e7 + 0c482ba commit 953bf2b

6 files changed

Lines changed: 10 additions & 10 deletions

File tree

moveit2/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,9 @@ RUN python3 -m pip install -U \
9393

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

100100
# Update the ownership of the source files (had to use sudo above to work around
101101
# a possible inherited 'insteadof' from the host that forces use of ssh

moveit2/moveit2_tutorials.repos

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
repositories:
22
moveit_task_constructor:
33
type: git
4-
url: https://github.com/ros-planning/moveit_task_constructor.git
4+
url: https://github.com/moveit/moveit_task_constructor.git
55
version: humble
66
moveit_visual_tools:
77
type: git
8-
url: https://github.com/ros-planning/moveit_visual_tools
8+
url: https://github.com/moveit/moveit_visual_tools
99
version: ros2
1010
rosparam_shortcuts:
1111
type: git

navigation2/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ ENV NAV2_DEPS_WS=${HOME_DIR}/nav2_deps_ws
4646
RUN mkdir -p ${NAVIGATION2_WS}/src
4747
WORKDIR ${NAVIGATION2_WS}/src
4848
ARG NAV2_BRANCH=humble
49-
RUN sudo git clone --branch $NAV2_BRANCH https://github.com/ros-planning/navigation2.git
49+
RUN sudo git clone --branch $NAV2_BRANCH https://github.com/ros-navigation/navigation2.git
5050

5151
# Get keys for Nav2 dependencies
5252
WORKDIR ${NAVIGATION2_WS}/

navigation2/navigation2.repos

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ repositories:
2929
version: rolling
3030
map_msgs:
3131
type: git
32-
url: https://github.com/ros-planning/navigation_msgs.git
32+
url: https://github.com/ros-navigation/navigation_msgs.git
3333
version: rolling
3434
ompl/ompl:
3535
type: git

renode_rcc/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM ubuntu:20.04
22
WORKDIR /root
3-
ENV DEBIAN_FRONTEND noninteractive
3+
ENV DEBIAN_FRONTEND=noninteractive
44

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

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

4343
WORKDIR /root
4444
COPY config .config/renode/

space_robots/demo_manual_pkgs.repos

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ repositories:
2929
version: main
3030
ros-humble-warehouse-ros-mongo:
3131
type: git
32-
url: https://github.com/ros-planning/warehouse_ros_mongo.git
32+
url: https://github.com/moveit/warehouse_ros_mongo.git
3333
version: ros2
3434
vision_msgs:
3535
type: git

0 commit comments

Comments
 (0)