Skip to content

Commit f6c2af1

Browse files
committed
feat: Clean up and Sync rtabmap configuration to all workspaces
1 parent 36cd3b8 commit f6c2af1

23 files changed

Lines changed: 101 additions & 9 deletions

File tree

aloha_ws/docker/Dockerfile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,13 @@ COPY --chown=$USERNAME:$USERNAME \
154154
RUN --mount=type=cache,target=/var/cache/apt,sharing=private \
155155
/tmp/install_cartographer.sh && rm /tmp/install_cartographer.sh
156156

157+
# rtabmap configuration
158+
ARG RTABMAP=""
159+
COPY --chown=$USERNAME:$USERNAME \
160+
modules/install_rtabmap.sh /tmp/install_rtabmap.sh
161+
RUN --mount=type=cache,target=/var/cache/apt,sharing=private \
162+
/tmp/install_rtabmap.sh && rm /tmp/install_rtabmap.sh
163+
157164
# TODO: Add more commands here
158165

159166
# Install udevadm for later use

aloha_ws/docker/compose.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ services:
4444
# ISAAC_ROS: ""
4545
# TODO: Set to "YES" if using Cartographer or set to "" if not using Cartographer
4646
# CARTOGRAPHER: ""
47+
# TODO: Set to "YES" if using RTAB-Map or set to "" if not using RTAB-Map
48+
# RTABMAP: ""
4749
cache_from:
4850
- j3soon/ros2-aloha-ws:buildcache-amd64
4951
- j3soon/ros2-aloha-ws:buildcache-arm64

delto_gripper_ws/docker/Dockerfile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,13 @@ COPY --chown=$USERNAME:$USERNAME \
154154
RUN --mount=type=cache,target=/var/cache/apt,sharing=private \
155155
/tmp/install_cartographer.sh && rm /tmp/install_cartographer.sh
156156

157+
# rtabmap configuration
158+
ARG RTABMAP=""
159+
COPY --chown=$USERNAME:$USERNAME \
160+
modules/install_rtabmap.sh /tmp/install_rtabmap.sh
161+
RUN --mount=type=cache,target=/var/cache/apt,sharing=private \
162+
/tmp/install_rtabmap.sh && rm /tmp/install_rtabmap.sh
163+
157164
# TODO: Add more commands here
158165

159166
# Install delto gripper dependencies

delto_gripper_ws/docker/compose.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ services:
4444
# ISAAC_ROS: ""
4545
# TODO: Set to "YES" if using Cartographer or set to "" if not using Cartographer
4646
# CARTOGRAPHER: ""
47+
# TODO: Set to "YES" if using RTAB-Map or set to "" if not using RTAB-Map
48+
# RTABMAP: ""
4749
cache_from:
4850
- j3soon/ros2-delto-gripper-ws:buildcache-amd64
4951
- j3soon/ros2-delto-gripper-ws:buildcache-arm64

docs/docker-modules/rtabmap.md

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
# RTAB-Map
22

3-
[![GitHub code](https://img.shields.io/badge/code-blue?logo=github&label=github)](https://github.com/j3soon/ros2-essentials/tree/main/rtabmap_ws)
4-
[![build](https://img.shields.io/github/actions/workflow/status/j3soon/ros2-essentials/build-rtabmap-ws.yaml?label=build)](https://github.com/j3soon/ros2-essentials/actions/workflows/build-rtabmap-ws.yaml)
5-
[![GitHub last commit](https://img.shields.io/github/last-commit/j3soon/ros2-essentials?path=rtabmap_ws)](https://github.com/j3soon/ros2-essentials/commits/main/rtabmap_ws)
6-
7-
[![DockerHub image](https://img.shields.io/badge/dockerhub-j3soon/ros2--rtabmap--ws-important.svg?logo=docker)](https://hub.docker.com/r/j3soon/ros2-rtabmap-ws/tags)
8-
![Docker image arch](https://img.shields.io/badge/arch-amd64-blueviolet)
9-
![Docker image version](https://img.shields.io/docker/v/j3soon/ros2-rtabmap-ws)
10-
![Docker image size](https://img.shields.io/docker/image-size/j3soon/ros2-rtabmap-ws)
3+
[![GitHub code](https://img.shields.io/badge/code-blue?logo=github&label=github)](https://github.com/j3soon/ros2-essentials/blob/main/docker_modules/install_rtabmap.sh)
114

125
## 🐳 Start Container
136

@@ -117,5 +110,5 @@ docker compose down
117110
```
118111
- It seems that the warning isn't a big deal. But it will interrupt debugging in the future.
119112
- Possible solution : set `VTK_LEGACY_REMOVE`, but it required to build from source.
120-
- Still not tested yet.
113+
- Still not tested yet.
121114
- [Issue Reference](https://discourse.vtk.org/t/vtk-9-0-rc1/2916)

gazebo_world_ws/docker/Dockerfile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,13 @@ COPY --chown=$USERNAME:$USERNAME \
154154
RUN --mount=type=cache,target=/var/cache/apt,sharing=private \
155155
/tmp/install_cartographer.sh && rm /tmp/install_cartographer.sh
156156

157+
# rtabmap configuration
158+
ARG RTABMAP=""
159+
COPY --chown=$USERNAME:$USERNAME \
160+
modules/install_rtabmap.sh /tmp/install_rtabmap.sh
161+
RUN --mount=type=cache,target=/var/cache/apt,sharing=private \
162+
/tmp/install_rtabmap.sh && rm /tmp/install_rtabmap.sh
163+
157164
# TODO: Add more commands here
158165
COPY --chown=$USERNAME:$USERNAME \
159166
.bashrc /home/$USERNAME/.bashrc

gazebo_world_ws/docker/compose.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ services:
4444
# ISAAC_ROS: ""
4545
# TODO: Set to "YES" if using Cartographer or set to "" if not using Cartographer
4646
# CARTOGRAPHER: ""
47+
# TODO: Set to "YES" if using RTAB-Map or set to "" if not using RTAB-Map
48+
# RTABMAP: ""
4749
cache_from:
4850
- j3soon/ros2-gazebo-world-ws:buildcache-amd64
4951
- j3soon/ros2-gazebo-world-ws:buildcache-arm64

go2_ws/docker/Dockerfile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,13 @@ COPY --chown=$USERNAME:$USERNAME \
154154
RUN --mount=type=cache,target=/var/cache/apt,sharing=private \
155155
/tmp/install_cartographer.sh && rm /tmp/install_cartographer.sh
156156

157+
# rtabmap configuration
158+
ARG RTABMAP=""
159+
COPY --chown=$USERNAME:$USERNAME \
160+
modules/install_rtabmap.sh /tmp/install_rtabmap.sh
161+
RUN --mount=type=cache,target=/var/cache/apt,sharing=private \
162+
/tmp/install_rtabmap.sh && rm /tmp/install_rtabmap.sh
163+
157164
# TODO: Add more commands here
158165

159166
# Install ros packages

go2_ws/docker/compose.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ services:
4444
# ISAAC_ROS: ""
4545
# TODO: Set to "YES" if using Cartographer or set to "" if not using Cartographer
4646
# CARTOGRAPHER: ""
47+
# TODO: Set to "YES" if using RTAB-Map or set to "" if not using RTAB-Map
48+
# RTABMAP: ""
4749
cache_from:
4850
- j3soon/ros2-go2-ws:buildcache-amd64
4951
- j3soon/ros2-go2-ws:buildcache-arm64

h1_ws/docker/Dockerfile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,13 @@ COPY --chown=$USERNAME:$USERNAME \
154154
RUN --mount=type=cache,target=/var/cache/apt,sharing=private \
155155
/tmp/install_cartographer.sh && rm /tmp/install_cartographer.sh
156156

157+
# rtabmap configuration
158+
ARG RTABMAP=""
159+
COPY --chown=$USERNAME:$USERNAME \
160+
modules/install_rtabmap.sh /tmp/install_rtabmap.sh
161+
RUN --mount=type=cache,target=/var/cache/apt,sharing=private \
162+
/tmp/install_rtabmap.sh && rm /tmp/install_rtabmap.sh
163+
157164
# TODO: Add more commands here
158165
COPY --chown=$USERNAME:$USERNAME \
159166
.bashrc /home/$USERNAME/.bashrc

0 commit comments

Comments
 (0)