Merge "base: tell gnupg to not use TTY when we import APT keys"

This commit is contained in:
Zuul 2018-12-01 12:57:07 +00:00 committed by Gerrit Code Review
commit d0ef376666
1 changed files with 1 additions and 1 deletions

View File

@ -348,7 +348,7 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences
{% block base_ubuntu_package_installation %}
{%- block base_ubuntu_package_key_installation %}
{% for key in base_apt_keys | customizable('apt_keys') %}
{%- if loop.first %}RUN {% else %} && {% endif %}apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 {{ key }}
{%- if loop.first %}RUN {% else %} && {% endif %}apt-key adv --no-tty --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 {{ key }}
{%- if not loop.last %} \
{% endif -%}
{% endfor %}