diff options
| author | Pierre Riteau <pierre@stackhpc.com> | 2021-08-30 15:09:09 +0200 |
|---|---|---|
| committer | Pierre Riteau <pierre@stackhpc.com> | 2021-08-30 15:09:09 +0200 |
| commit | 8d67183c82df8261c2f038a429186df2fcd44669 (patch) | |
| tree | 257b5a8192e9e167aafb177dd173427626923f5b /docker/base | |
| parent | afa230ace202ee952f1fa26c886c10744c01848e (diff) | |
| download | kolla-8d67183c82df8261c2f038a429186df2fcd44669.tar.gz kolla-8d67183c82df8261c2f038a429186df2fcd44669.zip | |
Install UCA GPG key
Change Ie19bf46236907d79cb42a5e94cd1067e952b8cbb dropped the Ubuntu
Cloud Archive (UCA) GPG key. This results in failures to build Ubuntu
container images in Kayobe CI.
Change-Id: Ieadf049459b8f6bc4568e2af24d3456ca469501a
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 8318d9e6b..9a8d1d1b2 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -259,6 +259,12 @@ COPY dpkg_reducing_disk_footprint /etc/dpkg/dpkg.cfg.d/dpkg_reducing_disk_footpr 'curl', 'gnupg' ] %} +# ubuntu-cloud-keyring to install UCA packages +{% if base_distro == 'ubuntu' %} +{% set base_ubuntu_package_pre_packages = base_ubuntu_package_pre_packages + [ + 'ubuntu-cloud-keyring' +] %} +{% endif %} {{ macros.install_packages(base_ubuntu_package_pre_packages | customizable("base_ubuntu_package_pre_packages")) }} {% endblock %} |