diff options
| author | Zuul <zuul@review.openstack.org> | 2018-12-01 12:57:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-12-01 12:57:07 +0000 |
| commit | d0ef376666cb9d27598f65746508e33ef3cbbf24 (patch) | |
| tree | d3ed24c9e5e60e62df03d2a5d8ad8a31052591a0 /docker | |
| parent | 71cc369e532c3e920ef35d81d599a7e360d3256b (diff) | |
| parent | 464844eeb89295d3922f3d93aaddd8dd16b40ae1 (diff) | |
| download | kolla-d0ef376666cb9d27598f65746508e33ef3cbbf24.tar.gz kolla-d0ef376666cb9d27598f65746508e33ef3cbbf24.zip | |
Merge "base: tell gnupg to not use TTY when we import APTÂ keys"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index c53a635b9..52617b88b 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 %} |