Skip to content

pull rosdep out of vcs scope#51

Merged
mikaelarguedas merged 2 commits intomasterfrom
fixup_vcs_scope
Mar 22, 2019
Merged

pull rosdep out of vcs scope#51
mikaelarguedas merged 2 commits intomasterfrom
fixup_vcs_scope

Conversation

@mikaelarguedas
Copy link
Copy Markdown
Contributor

As the initialization of rosdep should not be impacted by skip in the absence of vcs in the template parameters

The generated ros2 source Dockerfile will be identical as we specify both rosdep and vcs for that image

Signed-off-by: Mikael Arguedas <mikael.arguedas@gmail.com>
&& rosdep update
@[end if]@
@[if 'vcs' in locals()]@
@[ if vcs]@
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.

arguably we could also move this conditional lower if we consider that the creation of the workspace directory should be done regardless.

This PR justs restore the scope to what it was prior to https://github.com/osrf/docker_templates/pull/44/files

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 that where the case, then perhaps a devel and source image for ros2 could share more of the same template?

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.

It could, I guess it depends what we would call a "devel" image (discussed here).

Do you mean to always create a workspace (empty in the case of the devel image), and consumers will clone their own code in it ?

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.

Do you mean to always create a workspace (empty in the case of the devel image), and consumers will clone their own code in it ?

I like that. #49 (comment)

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.

Sounds good, I restricted the scope more in cea3e56. I'll make the other changes necessary for the ros2:devel image in a separate PR

Signed-off-by: Mikael Arguedas <mikael.arguedas@gmail.com>
This was referenced Mar 22, 2019
@mikaelarguedas mikaelarguedas merged commit 756a845 into master Mar 22, 2019
@mikaelarguedas mikaelarguedas deleted the fixup_vcs_scope branch March 22, 2019 02:15
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