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

[ROS] Crystal #206

Merged
merged 35 commits into from
Jan 3, 2019
Merged

[ROS] Crystal #206

merged 35 commits into from
Jan 3, 2019

Conversation

ruffsl
Copy link
Member

@ruffsl ruffsl commented Nov 16, 2018

Support for ROS2 Crystal
ros2/ros2#529

TODO list upstreaming to Docker Hub Official Library:

@ruffsl ruffsl requested a review from sloretz November 16, 2018 06:52
Copy link
Member Author

@ruffsl ruffsl left a comment

Choose a reason for hiding this comment

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

@sloretz , I added some questions. Let me know if find any answers.

ros2/manifest.yaml Outdated Show resolved Hide resolved
ros2/manifest.yaml Outdated Show resolved Hide resolved
ros2/crystal/ubuntu/bionic/ros1-bridge/Dockerfile Outdated Show resolved Hide resolved
ros2/manifest.yaml Outdated Show resolved Hide resolved
@nuclearsandwich
Copy link
Member

nuclearsandwich commented Dec 14, 2018

We should set up these images to use the new ROS2 main repository. The documentation hasn't switched over yet but the repositories are live. ros2/ros2_documentation#59

In the templates an $ID variable is used for main or testing. That logic needs to be updated to select between http://packages.ros.org/ros2/ubuntu and http://packages.ros.org/ros2-testing/ubuntu

README.md Outdated Show resolved Hide resolved
@ruffsl
Copy link
Member Author

ruffsl commented Dec 14, 2018

We should set up these images to use the new ROS2 main repository. The documentation hasn't switched over yet but the repositories are live. ros2/ros2_documentation#59

@nuclearsandwich , please see 1e3e24d and osrf/docker_templates@fcce956

In the templates an $ID variable is used for main or testing. That logic needs to be updated to select between http://packages.ros.org/ros2/ubuntu and http://packages.ros.org/ros2-testing/ubuntu

I'll try and expand the template to account for this later on, though it shouldn't block anything here.

@ruffsl ruffsl added the in review Waiting for review (Kanban column) label Dec 14, 2018
@ruffsl ruffsl changed the title WIP | [ROS2] Crystal [ROS2] Crystal Dec 14, 2018
@ruffsl ruffsl changed the title [ROS2] Crystal [ROS] Crystal Dec 15, 2018
@ruffsl
Copy link
Member Author

ruffsl commented Dec 21, 2018

@sloretz @tfoote and @nuclearsandwich , I've modified the PR in accordance with the existing ROS repo in the docker library. It now shares the same entrypoint and repo structure. I've also update the upstream PR to the library to point to the latest state of this PR. Let me know if you have any more suggestions or not.

Update: I've also merged the docker directories into the common ros folder to share the same manifest.

README.md Show resolved Hide resolved
@sloretz
Copy link
Contributor

sloretz commented Jan 3, 2019

It looks like an exception is raised on my machine when creating the dockerfiles for ros/source/ros2. Is there a different branch of osrf/docker_templates I should be using?

$ ./create_dockerfiles.py dir -d ./source/ros2
RuntimeError processing template 'docker_images/create_ros2_source_image.Dockerfile.em'
Traceback (most recent call last):
  File "./create_dockerfiles.py", line 70, in <module>
    main()
  File "./create_dockerfiles.py", line 67, in main
    create_files(data)
  File "/home/sloretz/projects/osrf-docker/env/lib/python3.5/site-packages/docker_templates-0.0.1-py3.5.egg/docker_templates/create.py", line 45, in create_files
    create_dockerfile(template_name, data, dockerfile_dir, verbose)
  File "/home/sloretz/projects/osrf-docker/env/lib/python3.5/site-packages/ros_buildfarm-2.0.1-py3.5.egg/ros_buildfarm/templates/__init__.py", line 162, in create_dockerfile
    content = expand_template(template_name, data)
  File "/home/sloretz/projects/osrf-docker/env/lib/python3.5/site-packages/ros_buildfarm-2.0.1-py3.5.egg/ros_buildfarm/templates/__init__.py", line 79, in expand_template
    template_path = get_template_path(template_name)
  File "/home/sloretz/projects/osrf-docker/env/lib/python3.5/site-packages/ros_buildfarm-2.0.1-py3.5.egg/ros_buildfarm/templates/__init__.py", line 40, in get_template_path
    raise RuntimeError("Failed to find template '%s'" % template_name)
RuntimeError: Failed to find template 'docker_images/create_ros2_source_image.Dockerfile.em'

@ruffsl
Copy link
Member Author

ruffsl commented Jan 3, 2019

The ROS 2 source docker file hasn't been generated for some time. I'm not surprised something broke, but this is not a blocker for the office images. Looks like the path to the em file just needs to be updated to reflect the directory restructure in the template package. Once I fix this, is there any other last changes to the official Docker images? Otherwise continue with the upstream process.

@sloretz
Copy link
Contributor

sloretz commented Jan 3, 2019

Once I fix this, is there any other last changes to the official Docker images? Otherwise continue with the upstream process.

No changes; it looks good to me.

@ruffsl ruffsl merged commit eb35e27 into master Jan 3, 2019
@ruffsl ruffsl deleted the ros2_crystal branch February 13, 2019 23:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
in review Waiting for review (Kanban column)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants