base: tell gnupg to not use TTY when we import APT keys
Debian builds fail with gnupg error:
INFO:kolla.common.utils.base:Executing: /tmp/apt-key-gpghome.utZMwIQ8EO/gpg.1.sh --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 418A7F2FB0E1E6E7EABF6FE8C2E73424D59097AB
INFO:kolla.common.utils.base:gpg: cannot open '/dev/tty': No such device or address
This change stops GnuPG from using tty.
Change-Id: I4a9f2fb2c9fdd21430ce3a9bd02999ae21e1847a
(cherry picked from commit 464844eeb8
)
This commit is contained in:
parent
980860d2f0
commit
53ea11205f
|
@ -374,7 +374,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 %}
|
||||
|
|
Loading…
Reference in New Issue