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

Arc 154 noetic base image #195

Merged
merged 9 commits into from
Oct 12, 2024
Merged

Conversation

MishkaMN
Copy link
Contributor

@MishkaMN MishkaMN commented Oct 9, 2024

PR Details

Description

After Humble migration, carma will be running noetic/humble hybrid system.
This is a change to stay on humble-develop branch until that branch is regression tested with the whole system.
This change is to only house ROS1 noetic dependencies in carma-base, removing foxy because ros2 humble will be used.

Please see the docker deployment design here

New usage of docker image build:
build-image.sh --jammy OR
build-image.sh --focal OR
build-image.sh no option to build both.

Resulting images will have an extra trailing name in their tag distinguising their names such as:
usdotfhwastol/carma-base:latest-jammy
usdotfhwastol/carma-base:latest-focla

Github Action is modifed to also check docker build and dockerhub push wiht distinctive trailing suffix for each OS at the same time.

If any dependency is missing, we can add them as we go, but this sould be enough for now. But these are removed:

Removed the AUTOWAREAUTO_DEPS argument, which contained ROS 2 Foxy packages.
Removed ROS 2 Foxy packages from the ROS_DEPS argument.
Removed the ROS 2 repository setup and installation steps.
Removed the locale setup for ROS 2.
Removed the installation of ROS 2 Foxy desktop and related packages.
Removed the temporary fix for ament_cmake (ROS 2 specific).
Removed the installation of the non-ros1 dependent version of catkin (which was used for ROS 2 builds).

Related GitHub Issue

NA

Related Jira Key

https://usdot-carma.atlassian.net/browse/ARC-154

Motivation and Context

From Foxy to Humble upgrade

How Has This Been Tested?

  • Tested by pushing (using custom branch name in actions) dockerhub images with correct suffixes to dockerhub:
    https://github.com/usdot-fhwa-stol/carma-base/actions/runs/11259501586/job/31308611551
    PLease see that it created with Docker organization usdotfhwastoldev and docker image tag arc-154-noetic-base-image-focal
    with focal in the end.
  • Tested that I am able to docker run -it <image-focal> bash into it
  • Tested that I am able to build cav_msgs at least inside the docker container

Types of changes

  • Defect fix (non-breaking change that fixes an issue)
  • New feature (non-breaking change that adds functionality)
  • Breaking change (fix or feature that cause existing functionality to change)

Checklist:

  • I have added any new packages to the sonar-scanner.properties file
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • All new and existing tests passed.

@MishkaMN MishkaMN self-assigned this Oct 9, 2024
@MishkaMN MishkaMN added the enhancement New feature or request label Oct 9, 2024
README.md Show resolved Hide resolved
focal/Dockerfile Outdated
@@ -90,7 +53,7 @@ ARG BASE_DEPS="ca-certificates \
python3-rosinstall \
ros-noetic-desktop-full \
xterm \
libmsgsl-dev"
libmsgsl-dev"

ARG ROS_DEPS="apt-transport-https \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Can we move the non-ros specific deps to base_deps? Like git, nano etc.
Might be helpful when creating the Dockerfile for humble

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I refactored the dependencies into their own txt files and used multiple RUN steps to be more readable and use caching more. Humble one already does this.

Copy link
Contributor

@adev4a adev4a left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks great to me!

@MishkaMN MishkaMN merged commit 8c624c5 into humble-develop Oct 12, 2024
2 checks passed
@MishkaMN MishkaMN deleted the arc-154-noetic-base-image branch October 12, 2024 19:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants