Skip to content

Commit

Permalink
Merge branch 'develop-dockerfile-ros' into develop. Close #158.
Browse files Browse the repository at this point in the history
**Description**

The new Space ROS no longer has packages in the user's home. Instead,
the Space ROS installation has been moved to `/opt`. This makes the
Dockerfile produced by the ROS backend fail, since it sources a
`setup.bash` file that no longer exists.

**Type**

- Bug: Code produced cannot be built.

**Additional context**

None.

**Requester**

- Ivan Perez.

**Method to check presence of bug**

Building and running the dockerfile completes correctly.

**Expected result**

The CI job that runs the ROS backend completes successfully, indicating
that the dockerfile produced builds and runs correctly.

**Solutoin implemented**

Modify produced dockerfile to:

- Depend on a specific version of Space ROS (humble-2024.10.0, latest as
  of the time of this writing).

- Source the `setup.bash` file from its correct location.

**Further notes**

None.
  • Loading branch information
ivanperez-keera committed Nov 13, 2024
2 parents e791b1c + 3c6a675 commit d16d55c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 4 additions & 0 deletions ogma-core/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Revision history for ogma-core

## [1.X.Y] - 2024-11-13

* Fix incorrect path when using Space ROS humble-2024.10.0 (#158).

## [1.4.1] - 2024-09-21

* Version bump 1.4.1 (#155).
Expand Down
4 changes: 2 additions & 2 deletions ogma-core/templates/ros/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM osrf/space-ros:latest
FROM osrf/space-ros:humble-2024.10.0

ARG USER=spaceros-user
ARG PACKAGE_PATH=/home/${USER}/monitors
Expand All @@ -12,5 +12,5 @@ USER ${USER}

SHELL ["/bin/bash", "-c"]
WORKDIR ${PACKAGE_PATH}
RUN source ${ROS_PATH}/install/setup.bash && \
RUN source /opt/spaceros/install/setup.bash && \
colcon build

0 comments on commit d16d55c

Please sign in to comment.