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.

Sign up for GitHub

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

Support expression of dependencies via install list file #612

Merged
merged 1 commit into from
Apr 1, 2019
Merged

Support expression of dependencies via install list file #612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ros_buildfarm/templates/devel/devel_task.Dockerfile.em
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,11 @@ RUN python3 -u /tmp/wrapper_scripts/apt.py update-install-clean -q -y ccache
dependency_versions=dependency_versions,
))@

@(TEMPLATE(
'snippet/install_dependencies_from_file.Dockerfile.em',
install_lists=install_lists,
))@

USER buildfarm
ENTRYPOINT ["sh", "-c"]
@{
Expand Down
5 changes: 5 additions & 0 deletions ros_buildfarm/templates/doc/doc_task.Dockerfile.em
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,11 @@ RUN pip3 install -U setuptools
dependency_versions=dependency_versions,
))@

@(TEMPLATE(
'snippet/install_dependencies_from_file.Dockerfile.em',
install_lists=install_lists,
))@

@[if os_name == 'ubuntu' and os_code_name[0] == 't']@
# Doxygen version 1.8.6 seems to generate excessive tagfiles when cross referencing,
# overriding with older package (1.7.6) from Precise
Expand Down
5 changes: 5 additions & 0 deletions ros_buildfarm/templates/release/binarydeb_task.Dockerfile.em
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,11 @@ RUN echo "@today_str"
dependency_versions=dependency_versions,
))@

@(TEMPLATE(
'snippet/install_dependencies_from_file.Dockerfile.em',
install_lists=install_lists,
))@

USER buildfarm
ENTRYPOINT ["sh", "-c"]
@{
Expand Down
4 changes: 4 additions & 0 deletions ros_buildfarm/templates/snippet/install_dependencies_from_file.Dockerfile.em
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@[for install_list in install_lists]@
COPY @(install_list) .
RUN xargs -a @(install_list) python3 -u /tmp/wrapper_scripts/apt.py update-install-clean -q -y -o Debug::pkgProblemResolver=yes
@[end for]@
1 change: 1 addition & 0 deletions scripts/devel/create_devel_task_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ def main(argv=sys.argv[1:]):

'dependencies': debian_pkg_names,
'dependency_versions': debian_pkg_versions,
'install_lists': [],

'testing': args.testing,
'prerelease_overlay': len(args.workspace_root) > 1,
Expand Down
1 change: 1 addition & 0 deletions scripts/doc/create_doc_task_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,6 +578,7 @@ def main(argv=sys.argv[1:]):

'dependencies': debian_pkg_names,
'dependency_versions': debian_pkg_versions,
'install_lists': [],

'canonical_base_url': doc_build_file.canonical_base_url,

Expand Down
1 change: 1 addition & 0 deletions scripts/release/create_binarydeb_task_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ def main(argv=sys.argv[1:]):

'dependencies': debian_pkg_names,
'dependency_versions': debian_pkg_versions,
'install_lists': [],

'rosdistro_name': args.rosdistro_name,
'package_name': args.package_name,
Expand Down