Skip to content

use templated ROS bootstrap tools install#244

Merged
mikaelarguedas merged 5 commits intomasterfrom
template_bootstrap_tools
Mar 22, 2019
Merged

use templated ROS bootstrap tools install#244
mikaelarguedas merged 5 commits intomasterfrom
template_bootstrap_tools

Conversation

@mikaelarguedas
Copy link
Copy Markdown
Contributor

This update the Dockerfiles based on osrf/docker_templates#52

Copy link
Copy Markdown
Member

@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.

LGTM

@mikaelarguedas mikaelarguedas force-pushed the template_bootstrap_tools branch from 894382f to 27da81c Compare March 21, 2019 23:21
@mikaelarguedas
Copy link
Copy Markdown
Contributor Author

@ruffsl I pushed the version with the updated dockerfile to reflect osrf/docker_templates@732a269.
Would you mind giving these another 👀 ?

@mikaelarguedas mikaelarguedas requested a review from ruffsl March 21, 2019 23:24
Copy link
Copy Markdown
Member

@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.

Some small questions, but still lgtm.

maintainer_name:
arch: amd64
type: distribution
version:
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think the version parameter was previously used for setting the package version in the apt install. Leaving it empty was to signify to the template function to poll the apt repo for the latest version number. Did you refactor this logic in docker_templates to match your repurpose of it here? Given osrf apt repos don't archive past version for long, this repurpose of version you've made seems more useful.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Oh I was actually wondering why some files had it

and some didn't

I didn't change any corresponding logic in the templates scripts. Surprising the generated files didnt change, maybe it's used only for gazebo? Do you remember where this is used exactly?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Discussed this offline with @ruffsl, we will not use version but ros_version instead, that allows to not change the semantic and be consistent with the name of the environment variable ROS_VERSION

arch: amd64
type: distribution
version:
version: 2
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Could we update the ardent Dockerfiles with this? I know its EOL, but its helpful to keep the auto generate dockerfile in sync so that we only need the single manifest file to regenerate all folders in the library.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Sure thing. Do you want me to update the ROS1 EOL Dockerfiles as well?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

If it's not to much trouble. Having updated .config/ros1/platform.yaml.em you should only need to delete the ros1 folders and run the ./create_dockerfolders.py in the ros directory. You may need to toggle the comments of the EOL listings to ensure they get regenerated.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Yeah that's no trouble at all. I'll update them all once we resolve the other pending question

…s install

Signed-off-by: Mikael Arguedas <mikael.arguedas@gmail.com>
Signed-off-by: Mikael Arguedas <mikael.arguedas@gmail.com>
Signed-off-by: Mikael Arguedas <mikael.arguedas@gmail.com>
Signed-off-by: Mikael Arguedas <mikael.arguedas@gmail.com>
Signed-off-by: Mikael Arguedas <mikael.arguedas@gmail.com>
@mikaelarguedas mikaelarguedas force-pushed the template_bootstrap_tools branch from 27da81c to a328e5a Compare March 22, 2019 03:08
@mikaelarguedas mikaelarguedas merged commit 42d7ab4 into master Mar 22, 2019
@mikaelarguedas mikaelarguedas deleted the template_bootstrap_tools branch March 22, 2019 03:41
@ruffsl ruffsl mentioned this pull request May 26, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants