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

Jsilva/change docker files for jazzy #260

Conversation

JesusSilvaUtrera
Copy link
Contributor

@JesusSilvaUtrera JesusSilvaUtrera commented Jul 17, 2024

🎉 New feature

This is part of the migration to Jazzy
Related to #266

Summary

Second PR for the migration to Jazzy. This time, I have included the changes to the docker directory to make it work with the new image.

Test it

Follow the instruction of the docker/README.md file to test it completely. See if the rosdep tool installs all necessary dependencies and the workspace builds fine.

Checklist

  • Signed all commits for DCO
  • Added tests
  • Added example and/or tutorial
  • Updated documentation (as needed)

Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining Signed-off-by messages.

JesusSilvaUtrera and others added 3 commits July 17, 2024 09:55
* Improves andino_navigation package. (#224)

Signed-off-by: Franco Cipollone <[email protected]>
Signed-off-by: JesusSilvaUtrera <[email protected]>

* Add basic Platform IO instructions (#229)

Signed-off-by: Gary Servin <[email protected]>
Signed-off-by: JesusSilvaUtrera <[email protected]>

* Modify Shell class API to allow dependency injection (#221)

Signed-off-by: Javier Balloffet <[email protected]>
Signed-off-by: JesusSilvaUtrera <[email protected]>

* Fixed wheel diameter in URDF (#93)

Signed-off-by: JesusSilvaUtrera <[email protected]>

* Added YAML file for default camera intrinsics (#169)

Signed-off-by: JesusSilvaUtrera <[email protected]>

* Adds references to o3de and isaac_sim simulations. (#232)

Signed-off-by: Franco Cipollone <[email protected]>
Signed-off-by: JesusSilvaUtrera <[email protected]>

* Added README for andino_bringup (#233)

Signed-off-by: JesusSilvaUtrera <[email protected]>

* Added binaries installation docs (#234)

Signed-off-by: JesusSilvaUtrera <[email protected]>

* andino_apps package created and andino_navigation package updated (#235)

* andino_apps package created and andino_navigation package updated

Signed-off-by: JesusSilvaUtrera <[email protected]>

* Minor changes from the PR

Signed-off-by: JesusSilvaUtrera <[email protected]>

* Update andino_navigation README with changes from PR

Signed-off-by: JesusSilvaUtrera <[email protected]>

* Add andino_apps package to ci.yaml

Signed-off-by: JesusSilvaUtrera <[email protected]>

* Fixed minor issues from the PR

Signed-off-by: JesusSilvaUtrera <[email protected]>

* Added 'andino_apps' to the general README

Signed-off-by: JesusSilvaUtrera <[email protected]>

---------

Signed-off-by: JesusSilvaUtrera <[email protected]>

* Minimal change to test launch file

Signed-off-by: JesusSilvaUtrera <[email protected]>

* Added webcam.yaml file and intrinsics are now publishing

Signed-off-by: JesusSilvaUtrera <[email protected]>

* Added raspicam.yaml with camera intrinsics and updated instructions in andino_hardware/README

Signed-off-by: JesusSilvaUtrera <[email protected]>

* Changed the 'camera_info_url' to be relative path

Signed-off-by: JesusSilvaUtrera <[email protected]>

---------

Signed-off-by: Franco Cipollone <[email protected]>
Signed-off-by: JesusSilvaUtrera <[email protected]>
Signed-off-by: Gary Servin <[email protected]>
Signed-off-by: Javier Balloffet <[email protected]>
Co-authored-by: Franco Cipollone <[email protected]>
Co-authored-by: Gary Servin <[email protected]>
Co-authored-by: Javier Balloffet <[email protected]>
Signed-off-by: JesusSilvaUtrera <[email protected]>
@JesusSilvaUtrera JesusSilvaUtrera force-pushed the jsilva/change_docker_files_for_Jazzy branch from a9bf2e6 to 5a7757c Compare July 17, 2024 07:55
@JesusSilvaUtrera
Copy link
Contributor Author

@francocipollone to approve this, we should test it on the real robot to see if any changes are needed, I was able to test the camera node locally with my webcam but just to be sure everything is working.

francocipollone and others added 4 commits July 19, 2024 16:21
Signed-off-by: Franco Cipollone <[email protected]>
Signed-off-by: Franco Cipollone <[email protected]>
Copy link
Collaborator

@francocipollone francocipollone left a comment

Choose a reason for hiding this comment

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

LGTM

I'd merge it and we can continue tracking missing stuff in the issue

docker/run.sh Outdated
Comment on lines 97 to 98
# chown -R "$USER" ${REPOSITORY_FOLDER_PATH}/.build
# chown -R "$USER" ${REPOSITORY_FOLDER_PATH}/.install
Copy link
Collaborator

Choose a reason for hiding this comment

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

Is it ok to have it commented?

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 will remove those lines, I left them JIC I needed to uncomment them on the future.

@@ -113,6 +115,7 @@ sudo docker run --privileged --net=host -it $NVIDIA_FLAGS \
-v ${REPOSITORY_FOLDER_PATH}/.build:$WORKSPACE_ROOT_CONTAINER/build:rw \
-v ${REPOSITORY_FOLDER_PATH}/.install:$WORKSPACE_ROOT_CONTAINER/install:rw \
-v $SSH_PATH:$SSH_PATH \
-u 1000:1000 \
Copy link
Collaborator

Choose a reason for hiding this comment

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

Is it ok to use an arbitrary uid and gid?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It's not entirely arbitrary, that's the uid and gid that was used with my user on Ubuntu22, so I tried to replicate that behavior as much as I could on Ubuntu24. I think we should be fine for now.

docker/run.sh Outdated
Comment on lines 88 to 89
WORKSPACE_SRC_CONTAINER=/home/ubuntu/ws/src/$REPOSITORY_FOLDER_NAME
WORKSPACE_ROOT_CONTAINER=/home/ubuntu/ws
Copy link
Collaborator

Choose a reason for hiding this comment

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

Is it going to find it on any computer if we use ubuntu as user?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It should because the same user would be used on any computer that runs the container, it's not as we did on Ubuntu22 where we were using the current user on the host machine.

JesusSilvaUtrera and others added 16 commits September 3, 2024 12:33
Signed-off-by: JesusSilvaUtrera <[email protected]>
* Added all necessary changes to the README

Signed-off-by: JesusSilvaUtrera <[email protected]>

* Removed a blank line

Signed-off-by: JesusSilvaUtrera <[email protected]>

---------

Signed-off-by: JesusSilvaUtrera <[email protected]>
Signed-off-by: JesusSilvaUtrera <[email protected]>
Signed-off-by: JesusSilvaUtrera <[email protected]>
Signed-off-by: JesusSilvaUtrera <[email protected]>
Signed-off-by: Franco Cipollone <[email protected]>
Co-authored-by: Lola Segura <[email protected]>
Signed-off-by: JesusSilvaUtrera <[email protected]>
Minor update to andino_hardware readme.

Signed-off-by: JesusSilvaUtrera <[email protected]>
* Improves andino_navigation package. (#224)

Signed-off-by: Franco Cipollone <[email protected]>
Signed-off-by: JesusSilvaUtrera <[email protected]>

* Add basic Platform IO instructions (#229)

Signed-off-by: Gary Servin <[email protected]>
Signed-off-by: JesusSilvaUtrera <[email protected]>

* Modify Shell class API to allow dependency injection (#221)

Signed-off-by: Javier Balloffet <[email protected]>
Signed-off-by: JesusSilvaUtrera <[email protected]>

* Fixed wheel diameter in URDF (#93)

Signed-off-by: JesusSilvaUtrera <[email protected]>

* Added YAML file for default camera intrinsics (#169)

Signed-off-by: JesusSilvaUtrera <[email protected]>

* Adds references to o3de and isaac_sim simulations. (#232)

Signed-off-by: Franco Cipollone <[email protected]>
Signed-off-by: JesusSilvaUtrera <[email protected]>

* Added README for andino_bringup (#233)

Signed-off-by: JesusSilvaUtrera <[email protected]>

* Added binaries installation docs (#234)

Signed-off-by: JesusSilvaUtrera <[email protected]>

* andino_apps package created and andino_navigation package updated (#235)

* andino_apps package created and andino_navigation package updated

Signed-off-by: JesusSilvaUtrera <[email protected]>

* Minor changes from the PR

Signed-off-by: JesusSilvaUtrera <[email protected]>

* Update andino_navigation README with changes from PR

Signed-off-by: JesusSilvaUtrera <[email protected]>

* Add andino_apps package to ci.yaml

Signed-off-by: JesusSilvaUtrera <[email protected]>

* Fixed minor issues from the PR

Signed-off-by: JesusSilvaUtrera <[email protected]>

* Added 'andino_apps' to the general README

Signed-off-by: JesusSilvaUtrera <[email protected]>

---------

Signed-off-by: JesusSilvaUtrera <[email protected]>

* Minimal change to test launch file

Signed-off-by: JesusSilvaUtrera <[email protected]>

* Added webcam.yaml file and intrinsics are now publishing

Signed-off-by: JesusSilvaUtrera <[email protected]>

* Added raspicam.yaml with camera intrinsics and updated instructions in andino_hardware/README

Signed-off-by: JesusSilvaUtrera <[email protected]>

* Changed the 'camera_info_url' to be relative path

Signed-off-by: JesusSilvaUtrera <[email protected]>

---------

Signed-off-by: Franco Cipollone <[email protected]>
Signed-off-by: JesusSilvaUtrera <[email protected]>
Signed-off-by: Gary Servin <[email protected]>
Signed-off-by: Javier Balloffet <[email protected]>
Co-authored-by: Franco Cipollone <[email protected]>
Co-authored-by: Gary Servin <[email protected]>
Co-authored-by: Javier Balloffet <[email protected]>
Signed-off-by: JesusSilvaUtrera <[email protected]>
Signed-off-by: JesusSilvaUtrera <[email protected]>
JesusSilvaUtrera and others added 8 commits September 16, 2024 14:51
Signed-off-by: Franco Cipollone <[email protected]>
Signed-off-by: Franco Cipollone <[email protected]>
Signed-off-by: Franco Cipollone <[email protected]>
Signed-off-by: JesusSilvaUtrera <[email protected]>
* Added all necessary changes to the README

Signed-off-by: JesusSilvaUtrera <[email protected]>

* Removed a blank line

Signed-off-by: JesusSilvaUtrera <[email protected]>

---------

Signed-off-by: JesusSilvaUtrera <[email protected]>
…usSilvaUtrera/andino into jsilva/change_docker_files_for_Jazzy
@JesusSilvaUtrera
Copy link
Contributor Author

I will close and open a new fresh PR with the changes.

@JesusSilvaUtrera JesusSilvaUtrera deleted the jsilva/change_docker_files_for_Jazzy branch September 16, 2024 12:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

3 participants