Skip to content

Reapply "Migrate away from apt-key" #1115

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

Merged
cottsay merged 1 commit into from
Jan 7, 2026
Merged

Reapply "Migrate away from apt-key" #1115

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
2 changes: 1 addition & 1 deletion ros_buildfarm/templates/ci/ci_create_tasks.Dockerfile.em
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ args = \
' ' + arch + \
' --workspace-root ' + ' '.join(workspace_mount_point) + \
' --distribution-repository-urls ' + ' '.join(distribution_repository_urls) + \
' --distribution-repository-key-files ' + ' ' .join(['/tmp/keys/%d.key' % i for i in range(len(distribution_repository_keys))]) + \
' --distribution-repository-key-files ' + ' ' .join(['/etc/apt/keyrings/ros-buildfarm-%d.key' % i for i in range(len(distribution_repository_keys))]) + \
' --env-vars ' + ' ' .join(['%s=%s' % key_value for key_value in env_vars.items()])
build_args = args + \
' --build-tool ' + build_tool + \
Expand Down
2 changes: 1 addition & 1 deletion ros_buildfarm/templates/devel/devel_create_tasks.Dockerfile.em
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ cmd = \
' --os-code-name ' + os_code_name + \
' --arch ' + arch + \
' --distribution-repository-urls ' + ' '.join(distribution_repository_urls) + \
' --distribution-repository-key-files ' + ' ' .join(['/tmp/keys/%d.key' % i for i in range(len(distribution_repository_keys))]) + \
' --distribution-repository-key-files ' + ' ' .join(['/etc/apt/keyrings/ros-buildfarm-%d.key' % i for i in range(len(distribution_repository_keys))]) + \
' --build-tool ' + build_tool + \
' --ros-version ' + str(ros_version) + \
' --env-vars ' + ' ' .join(['%s=%s' % key_value for key_value in env_vars.items()])
Expand Down
2 changes: 1 addition & 1 deletion ros_buildfarm/templates/doc/doc_create_task.Dockerfile.em
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ cmds = [
' --build-tool ' + build_tool + \
' --vcs-info "%s"' % vcs_info + \
' --distribution-repository-urls ' + ' '.join(distribution_repository_urls) + \
' --distribution-repository-key-files ' + ' ' .join(['/tmp/keys/%d.key' % i for i in range(len(distribution_repository_keys))]) + \
' --distribution-repository-key-files ' + ' ' .join(['/etc/apt/keyrings/ros-buildfarm-%d.key' % i for i in range(len(distribution_repository_keys))]) + \
' --env-vars ' + ' ' .join(['%s=%s' % key_value for key_value in env_vars.items()]) + \
(' --force' if force else '') + \
' --output-dir /tmp/generated_documentation' + \
Expand Down
2 changes: 1 addition & 1 deletion ros_buildfarm/templates/doc/rosdoc2_create_task.Dockerfile.em
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ cmds = [
' --os-code-name ' + os_code_name + \
' --arch ' + arch + \
' --distribution-repository-urls ' + ' '.join(distribution_repository_urls) + \
' --distribution-repository-key-files ' + ' ' .join(['/tmp/keys/%d.key' % i for i in range(len(distribution_repository_keys))]) + \
' --distribution-repository-key-files ' + ' ' .join(['/etc/apt/keyrings/ros-buildfarm-%d.key' % i for i in range(len(distribution_repository_keys))]) + \
' --env-vars ' + ' ' .join(['%s=%s' % key_value for key_value in env_vars.items()]) + \
' --dockerfile-dir /tmp/docker_doc',
]
Expand Down
2 changes: 1 addition & 1 deletion ros_buildfarm/templates/release/deb/binarypkg_create_task.Dockerfile.em
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ cmds.append(
' ' + os_code_name +
' ' + arch +
' --distribution-repository-urls ' + ' '.join(distribution_repository_urls) +
' --distribution-repository-key-files ' + ' ' .join(['/tmp/keys/%d.key' % i for i in range(len(distribution_repository_keys))]) +
' --distribution-repository-key-files ' + ' ' .join(['/etc/apt/keyrings/ros-buildfarm-%d.key' % i for i in range(len(distribution_repository_keys))]) +
' --binarypkg-dir ' + binarypkg_dir +
' --env-vars ' + ' '.join(build_environment_variables) +
' --dockerfile-dir ' + dockerfile_dir +
Expand Down
8 changes: 4 additions & 4 deletions ros_buildfarm/templates/snippet/add_distribution_repositories.Dockerfile.em
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
RUN mkdir /tmp/keys
RUN mkdir -p /etc/apt/keyrings
@{
debian_before_stretch = ('squeeze', 'wheezy', 'jessie')
ubuntu_before_bionic = (
Expand All @@ -12,12 +12,12 @@ ubuntu_before_bionic = (
RUN for i in 1 2 3; do apt-get update && apt-get install -q -y gnupg ca-certificates && apt-get clean && break || if [ $i -lt 3 ]; then sleep 5; else false; fi; done
@[end if]@
@[for i, key in enumerate(distribution_repository_keys)]@
RUN echo "@('\\n'.join(key.splitlines()))" > /tmp/keys/@(i).key@[if key] && apt-key add /tmp/keys/@(i).key@[end if]
RUN echo "@('\\n'.join(key.splitlines()))" > /etc/apt/keyrings/ros-buildfarm-@(i).key
@[end for]@
@[for i, url in enumerate(distribution_repository_urls)]@
RUN echo deb @[if not distribution_repository_keys[i]][trusted=yes] @[end if]@ @url @os_code_name main | tee -a /etc/apt/sources.list.d/buildfarm.list
RUN echo deb [@[if distribution_repository_keys[i]]signed-by=/etc/apt/keyrings/ros-buildfarm-@(i).key@[else]trusted=yes@[end if]] @url @os_code_name main | tee -a /etc/apt/sources.list.d/buildfarm.list
@[if add_source and url == target_repository]@
RUN echo deb-src @[if not distribution_repository_keys[i]][trusted=yes] @[end if]@ @url @os_code_name main | tee -a /etc/apt/sources.list.d/buildfarm.list
RUN echo deb-src [@[if distribution_repository_keys[i]]signed-by=/etc/apt/keyrings/ros-buildfarm-@(i).key@[else]trusted=yes@[end if]] @url @os_code_name main | tee -a /etc/apt/sources.list.d/buildfarm.list
@[end if]@
@[end for]@
@# On Ubuntu Trusty a newer version of dpkg is required to install Debian packages created by stdeb on newer distros
Expand Down
Loading