Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rolling ROS image is now based on "noble" (backport #220) #242

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Aug 17, 2024

Changes Made

I am not tracking the underlying changes to the ROS image in great detail, @evan-palmer, you may have more info or a better perspective on how to resolve this issue.

However, it looks like Docker images for "rolling" are now built on Ubuntu "noble."

This brings a few major changes, some of which were also addressed when porting to "jazzy"

This PR pulls out the elements specific to "noble" without the jazzy-specific adaptations (particularly building MAVROS from source).

Specifically:

  • Use the existing non-root user "ubuntu" (uid/gid 1000) which already exists in the image.
  • Python packages installed with pip are placed in a venv

Please note: this image must use Gazebo "harmonic," so it is based on #223 . Complete and merge that PR before merging this PR.

Testing

TBD


This is an automatic backport of pull request #220 done by Mergify.

* Update to use Harmonic

* Update main Dockerfile for "noble" base images:

- Use the provided user "ubuntu" at UID 1000
- Use a venv for user-installed python packages

* Add "third-party" rosdep from OSRF for gazebo deps.

* Install cppzmq-dev for Gazebo

* Allow pushing to apl-ocean-engineering

* Build mavros from source.

* Build mavros from source, with patch to fix yaml-cpp linkage

* ardupilot script should not activate venv by default.  Activate blue venv instead.

* Reverse change in docker.yaml action.

* Insert comment before arduplot additions to .bashrc

* Update username in .devcontainer/

* Replace patches for mavros/mavlink with sed one-liners.

* Extend Docker build timeout in github actions to allow for extended arm64 build times.

* timeout_minutes should be at job level?

* Disabled arm64 build for "robot"

Also:

* Set python in venv as default Python in dev container
* Remove build timeout in github action (which was ignored)

* Correctly disable arm64 build.

---------

Co-authored-by: Aaron Marburg <amarburg@uw.edu>
(cherry picked from commit fe3861d)

# Conflicts:
#	.devcontainer/robot/Dockerfile
#	.devcontainer/robot/devcontainer.json
#	.docker/Dockerfile
@mergify mergify bot added the conflicts label Aug 17, 2024
Copy link
Author

mergify bot commented Aug 17, 2024

Cherry-pick of fe3861d has failed:

On branch mergify/bp/jazzy/pr-220
Your branch is up to date with 'origin/jazzy'.

You are currently cherry-picking commit fe3861d.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .devcontainer/nouveau/Dockerfile
	modified:   .devcontainer/nouveau/devcontainer.json
	modified:   .devcontainer/nvidia/Dockerfile
	modified:   .devcontainer/nvidia/devcontainer.json
	modified:   .github/workflows/docker.yaml
	modified:   .vscode/settings.json

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .devcontainer/robot/Dockerfile
	deleted by us:   .devcontainer/robot/devcontainer.json
	both modified:   .docker/Dockerfile

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@evan-palmer
Copy link
Collaborator

Closing this in favor of #243 due to failed backport

@evan-palmer evan-palmer deleted the mergify/bp/jazzy/pr-220 branch August 17, 2024 20:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants