aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin@juszkiewicz.com.pl>2018-11-21 11:00:59 +0100
committerMarcin Juszkiewicz <marcin@juszkiewicz.com.pl>2018-11-21 11:00:59 +0100
commit464844eeb89295d3922f3d93aaddd8dd16b40ae1 (patch)
treecbfa1991d108d47c2b63fcfafc2258397809bbc5 /docker
parent1affeaa2e223705433f1d1a0e23c6af98f9e2bc3 (diff)
downloadkolla-464844eeb89295d3922f3d93aaddd8dd16b40ae1.tar.gz
kolla-464844eeb89295d3922f3d93aaddd8dd16b40ae1.zip
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
Diffstat (limited to 'docker')
-rw-r--r--docker/base/Dockerfile.j22
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index d6b8c3ca0..436337c9e 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -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 %}