From 464844eeb89295d3922f3d93aaddd8dd16b40ae1 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
Date: Wed, 21 Nov 2018 11:00:59 +0100
Subject: [PATCH] =?UTF-8?q?base:=20tell=20gnupg=20to=20not=20use=20TTY=20w?=
 =?UTF-8?q?hen=20we=20import=20APT=C2=A0keys?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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
---
 docker/base/Dockerfile.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index d6b8c3ca03..436337c9e5 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 %}