diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-12-28 22:05:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-12-28 22:05:39 +0000 |
| commit | e5fb6173eac03ce926bda1fb9d7ac375568f8cb9 (patch) | |
| tree | ba99315ff4008f09ffc782d80fe016f673a0fc99 /docker/base | |
| parent | 12bea3f9f659e6a4e8611c5edf59e69e204c3792 (diff) | |
| parent | af7a1da8076f7a253795c2a431b3eeec4cd348d7 (diff) | |
| download | kolla-e5fb6173eac03ce926bda1fb9d7ac375568f8cb9.tar.gz kolla-e5fb6173eac03ce926bda1fb9d7ac375568f8cb9.zip | |
Merge "Removed percona from ubuntu repos"
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 18 | ||||
| -rw-r--r-- | docker/base/sources.list.ubuntu | 3 |
2 files changed, 11 insertions, 10 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index ed94a6c34..c7faddf6b 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -67,9 +67,9 @@ COPY {{ repo_file }} /etc/yum.repos.d/{{ repo_file }} {% if install_metatype in ['rdo', 'mixed'] %} -{% for cmd in rpm_setup %} +{% for cmd in rpm_setup %} {{ cmd }} -{% endfor %} +{% endfor %} {% endif %} {# endif for repo setup for all RHEL except RHEL OSP #} @@ -228,15 +228,19 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences %} {% if base_distro == 'ubuntu' %} + {# 05CE15085FC09D18E99EFB22684A14CF2582E0C5 -- InfluxDB Packaging Service <support@influxdb.com> #} + {# 177F4010FE56CA3336300305F1656F24C74CD1D8 -- MariaDB Signing Key <signing-key@mariadb.org> #} + {# 391A9AA2147192839E9DB0315EDB1B62EC4926EA -- Canonical Cloud Archive Signing Key <ftpmaster@canonical.com> #} + {# 418A7F2FB0E1E6E7EABF6FE8C2E73424D59097AB -- packagecloud ops (production key) <ops@packagecloud.io> #} + {# 46095ACC8548582C1A2699A9D27D666CD88E42B4 -- Elasticsearch (Elasticsearch Signing Key) <dev_ops@elasticsearch.org> #} + {# 58118E89F3A912897C070ADBF76221572C52609D -- Docker Release Tool (releasedocker) <docker@docker.com> #} {% set base_apt_keys = [ - '0xF1656F24C74CD1D8', - '0x9334a25f8507efa5', + '05CE15085FC09D18E99EFB22684A14CF2582E0C5', + '177F4010FE56CA3336300305F1656F24C74CD1D8', '391A9AA2147192839E9DB0315EDB1B62EC4926EA', - '430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A', + '418A7F2FB0E1E6E7EABF6FE8C2E73424D59097AB', '46095ACC8548582C1A2699A9D27D666CD88E42B4', '58118E89F3A912897C070ADBF76221572C52609D', - '05CE15085FC09D18E99EFB22684A14CF2582E0C5', - '418A7F2FB0E1E6E7EABF6FE8C2E73424D59097AB', ] %} {% elif base_distro == 'debian' %} {% set base_apt_keys = [ diff --git a/docker/base/sources.list.ubuntu b/docker/base/sources.list.ubuntu index 162ba9941..d5242d833 100644 --- a/docker/base/sources.list.ubuntu +++ b/docker/base/sources.list.ubuntu @@ -13,9 +13,6 @@ deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main # MariaDB 10.0 repo deb http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.0/ubuntu xenial main -# Percona repo (for xtrabackup) -deb http://repo.percona.com/apt xenial main - # Elastic repo deb http://packages.elastic.co/elasticsearch/2.x/debian stable main |