aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-05-28 13:35:21 +0000
committerGerrit Code Review <review@openstack.org>2018-05-28 13:35:21 +0000
commit33dcb9f5b639805591c5cd1395136c2acaf279bd (patch)
tree21bf1876dca530a9b6e94b99831714ead07db9d8
parent838f451f88a9331d4ae93309b4d6127b96c19640 (diff)
parent0dde1278978457ca49e18080f52fa6523675f25f (diff)
downloadkolla-33dcb9f5b639805591c5cd1395136c2acaf279bd.tar.gz
kolla-33dcb9f5b639805591c5cd1395136c2acaf279bd.zip
Merge "base: import Linaro ERP 18.06 repo key"
-rw-r--r--docker/base/Dockerfile.j21
1 files changed, 1 insertions, 0 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 045f76155..703bdfb8f 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -358,6 +358,7 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences
'901F9177AB97ACBE',
] %}
{% set remote_apt_keys = [
+ 'http://obs.linaro.org/ERP:/18.06/Debian_9/Release.key',
'https://bintray.com/user/downloadSubjectPublicKey?username=bintray',
] %}
{% set base_apt_packages = base_apt_packages +