diff options
| author | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2019-01-09 13:04:54 +0800 |
|---|---|---|
| committer | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2019-01-09 13:31:15 +0800 |
| commit | ae883440255b02478bc3bd5cdcaf23a26869c5f1 (patch) | |
| tree | ea94846323c131e8546c109bc1267cce928a5ddc /docker/base/Dockerfile.j2 | |
| parent | f46b1c3b084c15757a93d61d9a4b95be9edb8672 (diff) | |
| download | kolla-ae883440255b02478bc3bd5cdcaf23a26869c5f1.tar.gz kolla-ae883440255b02478bc3bd5cdcaf23a26869c5f1.zip | |
Fix grafana repo
Grafana repository is moved from packagecloud to
packages.grafana.com[0]. Based on new grafana install guide[1], update
the grafana.repo
[0] https://grafana.com/blog/2019/01/05/moving-to-packages.grafana.com/
[1] http://docs.grafana.org/installation/rpm/#install-via-yum-repository
Closes-Bug: #1810867
Change-Id: Ib065fdc561b72fc013b952b3df41ee83b083194e
Diffstat (limited to 'docker/base/Dockerfile.j2')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index eef115017..5b21dd1c5 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -80,7 +80,7 @@ RUN echo {{ centos_contentdir }} >> /etc/yum/vars/contentdir {% set base_yum_repo_keys = [ 'https://artifacts.elastic.co/GPG-KEY-elasticsearch', - 'https://grafanarel.s3.amazonaws.com/RPM-GPG-KEY-grafana', + 'https://packages.grafana.com/gpg.key', 'https://repos.influxdata.com/influxdb.key', 'https://packagecloud.io/gpg.key', 'https://www.percona.com/downloads/RPM-GPG-KEY-percona', @@ -318,7 +318,6 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences {% if base_distro == 'ubuntu' %} {# 05CE15085FC09D18E99EFB22684A14CF2582E0C5 -- InfluxDB Packaging Service <support@influxdb.com> #} {# 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> #} {# 49B07274951063870A8B7EAE7B8AA1A344C05248 -- Opendaylight Signing Key <https://launchpad.net/~odl-team> #} {# 4D1BB29D63D98E422B2113B19334A25F8507EFA5 -- Percona MySQL Development Team (Packaging key) <mysql-dev@percona.com> #} @@ -329,7 +328,6 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences {% set base_apt_keys = [ '05CE15085FC09D18E99EFB22684A14CF2582E0C5', '391A9AA2147192839E9DB0315EDB1B62EC4926EA', - '418A7F2FB0E1E6E7EABF6FE8C2E73424D59097AB', '46095ACC8548582C1A2699A9D27D666CD88E42B4', '49B07274951063870A8B7EAE7B8AA1A344C05248', '4D1BB29D63D98E422B2113B19334A25F8507EFA5', @@ -339,17 +337,18 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences 'A20F259AEB9C94BB' ] %} {% set remote_apt_keys = [ - 'https://packagecloud.io/rabbitmq/rabbitmq-server/gpgkey' + 'https://packagecloud.io/rabbitmq/rabbitmq-server/gpgkey', + 'https://packages.grafana.com/gpg.key' ] %} {% elif base_distro == 'debian' %} {% set base_apt_keys = [ '46095ACC8548582C1A2699A9D27D666CD88E42B4', '4D1BB29D63D98E422B2113B19334A25F8507EFA5', - '418A7F2FB0E1E6E7EABF6FE8C2E73424D59097AB', ] %} {% set remote_apt_keys = [ 'http://obs.linaro.org/ERP:/18.06/Debian_9/Release.key', 'https://download.docker.com/linux/debian/gpg', + 'https://packages.grafana.com/gpg.key' ] %} {% set base_apt_packages = base_apt_packages + ['sudo',] |