diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-10-19 00:24:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-10-19 00:24:46 +0000 |
| commit | 45ebb370439f3662798daa43b4ece45f9199793d (patch) | |
| tree | 3aa7e290e892446395c2540d238f13048bd4cc7a | |
| parent | 0805fb63691a077acb2aa236059f868b86360c35 (diff) | |
| parent | 70de71cc1664071d015c271f868cd4fe30a9f6bf (diff) | |
| download | kolla-45ebb370439f3662798daa43b4ece45f9199793d.tar.gz kolla-45ebb370439f3662798daa43b4ece45f9199793d.zip | |
Merge "Fix mariadb build issue"
| -rw-r--r-- | docker/base/Dockerfile.j2 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 3ea1df7bb..e9fa65db3 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -233,6 +233,7 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences {% if base_distro == 'ubuntu' %} {% set base_apt_keys = [ '0xF1656F24C74CD1D8', + '0x9334a25f8507efa5', '391A9AA2147192839E9DB0315EDB1B62EC4926EA', '430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A', '46095ACC8548582C1A2699A9D27D666CD88E42B4', |