diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-05-23 00:01:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-05-23 00:01:40 +0000 |
| commit | e731db2c159d817b402f8bc1bc9955a182a4d669 (patch) | |
| tree | 08b8e633e1401d0a3f411fea5ba90115e6bc7257 /docker/base/Dockerfile.j2 | |
| parent | cf328ff56245f589c57ab4e75303af978b411ebe (diff) | |
| parent | f034a8b2098e73f47ad6fa05d95d4a30ae2e4d2e (diff) | |
| download | kolla-e731db2c159d817b402f8bc1bc9955a182a4d669.tar.gz kolla-e731db2c159d817b402f8bc1bc9955a182a4d669.zip | |
Merge "Add qdrouterd container"
Diffstat (limited to 'docker/base/Dockerfile.j2')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 2e575df82..8a6d04470 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -297,6 +297,7 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences {# 46095ACC8548582C1A2699A9D27D666CD88E42B4 -- Elasticsearch (Elasticsearch Signing Key) <dev_ops@elasticsearch.org> #} {# 4D1BB29D63D98E422B2113B19334A25F8507EFA5 -- Percona MySQL Development Team (Packaging key) <mysql-dev@percona.com> #} {# 58118E89F3A912897C070ADBF76221572C52609D -- Docker Release Tool (releasedocker) <docker@docker.com> #} + {# 4D8EB5FDA37AB55F41A135203BF88A0C6A770882 -- Apache Qpid PPA Signing Key <dev@qpid.apache.org> #} {# 901F9177AB97ACBE -- Treasure Data, Inc (Treasure Agent Official Signing key) <support@treasure-data.com> #} {% set base_apt_keys = [ '05CE15085FC09D18E99EFB22684A14CF2582E0C5', @@ -306,6 +307,7 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences '46095ACC8548582C1A2699A9D27D666CD88E42B4', '4D1BB29D63D98E422B2113B19334A25F8507EFA5', '58118E89F3A912897C070ADBF76221572C52609D', + '4D8EB5FDA37AB55F41A135203BF88A0C6A770882', '901F9177AB97ACBE', ] %} {% elif base_distro == 'debian' %} |