From ae883440255b02478bc3bd5cdcaf23a26869c5f1 Mon Sep 17 00:00:00 2001 From: Jeffrey Zhang Date: Wed, 9 Jan 2019 13:04:54 +0800 Subject: [PATCH] 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 --- docker/base/Dockerfile.j2 | 9 ++++----- docker/base/grafana.repo | 6 ++++-- docker/base/sources.list.debian | 2 +- docker/base/sources.list.ubuntu | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index eef1150173..5b21dd1c53 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 #} {# 391A9AA2147192839E9DB0315EDB1B62EC4926EA -- Canonical Cloud Archive Signing Key #} - {# 418A7F2FB0E1E6E7EABF6FE8C2E73424D59097AB -- packagecloud ops (production key) #} {# 46095ACC8548582C1A2699A9D27D666CD88E42B4 -- Elasticsearch (Elasticsearch Signing Key) #} {# 49B07274951063870A8B7EAE7B8AA1A344C05248 -- Opendaylight Signing Key #} {# 4D1BB29D63D98E422B2113B19334A25F8507EFA5 -- Percona MySQL Development Team (Packaging key) #} @@ -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',] diff --git a/docker/base/grafana.repo b/docker/base/grafana.repo index dc8d30b445..f4b6f1f3f1 100644 --- a/docker/base/grafana.repo +++ b/docker/base/grafana.repo @@ -1,7 +1,9 @@ [grafana] name=grafana -baseurl=https://packagecloud.io/grafana/stable/el/7/$basearch +baseurl=https://packages.grafana.com/oss/rpm repo_gpgcheck=1 enabled=1 gpgcheck=1 -gpgkey=https://packagecloud.io/gpg.key https://grafanarel.s3.amazonaws.com/RPM-GPG-KEY-grafana +gpgkey=https://packages.grafana.com/gpg.key +sslverify=1 +sslcacert=/etc/pki/tls/certs/ca-bundle.crt diff --git a/docker/base/sources.list.debian b/docker/base/sources.list.debian index 50532ddfb7..7cb05cab8a 100644 --- a/docker/base/sources.list.debian +++ b/docker/base/sources.list.debian @@ -8,7 +8,7 @@ deb http://security.debian.org/debian-security stretch/updates main # ceph, libvirt, opendaylight, openvswitch, qemu deb http://obs.linaro.org/ERP:/18.06/Debian_9/ ./ -deb [arch=amd64] https://packagecloud.io/grafana/stable/debian/ stretch main +deb https://packages.grafana.com/oss/deb stable main # elasticsearch (arch:all), logstash (arch:all), kibana (arch:amd64) deb [arch=amd64] https://artifacts.elastic.co/packages/5.x/apt stable main diff --git a/docker/base/sources.list.ubuntu b/docker/base/sources.list.ubuntu index 5448bb0673..0b433eba3f 100644 --- a/docker/base/sources.list.ubuntu +++ b/docker/base/sources.list.ubuntu @@ -19,7 +19,7 @@ deb https://artifacts.elastic.co/packages/5.x/apt stable main deb https://repos.influxdata.com/ubuntu bionic stable # Grafana repo -deb https://packagecloud.io/grafana/stable/debian/ jessie main +deb https://packages.grafana.com/oss/deb stable main # Fluentd repo deb http://packages.treasuredata.com/2/ubuntu/xenial/ xenial contrib