aboutsummaryrefslogtreecommitdiff
path: root/docker/base
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org>2022-09-21 16:28:56 +0200
committerRadosław Piliszek <radoslaw.piliszek@gmail.com>2022-09-27 08:17:15 +0000
commit542bbcdb6b2827812e529c29f4a44f542ec1f801 (patch)
treeb4c6ab0f81fbd531d18bacc64d3dd7c8f43e99b8 /docker/base
parent878b00013b01e3d02a704ce7c9fac1629cd1a705 (diff)
downloadkolla-542bbcdb6b2827812e529c29f4a44f542ec1f801.tar.gz
kolla-542bbcdb6b2827812e529c29f4a44f542ec1f801.zip
grafana: ignore SHA1 gpg key on CentOS Stream 9 (and family)
RHEL 9 refuses to use SHA1 gpg keys. Grafana team still did not handled key upgrade: https://github.com/grafana/grafana/issues/41036 Change-Id: Id963271103ce1397b7a5498d032e8f797edfcc70
Diffstat (limited to 'docker/base')
-rw-r--r--docker/base/Dockerfile.j22
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 13af63149..1da98d7fc 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -65,10 +65,10 @@ COPY dnf.conf /etc/dnf/dnf.conf
{#
Repo files not available for CentOS Stream 9:
'elasticsearch.repo', # signed with SHA1 key https://github.com/elastic/elasticsearch/issues/85876
- 'grafana.repo', # signed with SHA1 key https://github.com/grafana/grafana/issues/41036
'proxysql.repo', # no repository yet for RHEL9 family
#}
{% set base_yum_repo_files = [
+ 'grafana.repo',
'mariadb.repo',
'rabbitmq_rabbitmq-server.repo',
'td.repo',