summaryrefslogtreecommitdiff
path: root/docker/base
diff options
context:
space:
mode:
authorMichal Nasiadka <mnasiadka@gmail.com>2023-01-02 12:14:12 +0100
committerMarcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org>2023-01-18 10:41:03 +0000
commitff29af45d70bedfd76b30f015e9e4c68ca89bf59 (patch)
tree6346cd607135215da73c90d6ac7e9555821d62f9 /docker/base
parentd34ae7edb17eda7e4a2b6c4e0989ce2cebf116a5 (diff)
downloadkolla-ff29af45d70bedfd76b30f015e9e4c68ca89bf59.tar.gz
kolla-ff29af45d70bedfd76b30f015e9e4c68ca89bf59.zip
grafana: remove SHA1 workaround
Change-Id: I08fe2827bc58baa95d396daf28de1079e3df4f77 (cherry picked from commit 47a9a818596b27f658fb7b40aac2130fd04b66b6)
Diffstat (limited to 'docker/base')
-rw-r--r--docker/base/Dockerfile.j24
1 files changed, 0 insertions, 4 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index cad81cc39..11a6547be 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -74,10 +74,6 @@ COPY dnf.conf /etc/dnf/dnf.conf
{% set base_yum_url_packages = [
] %}
-{#
-SHA1 keys are not supported in RHEL9: https://github.com/rpm-software-management/rpm/issues/1977
- 'https://packages.grafana.com/gpg.key',
- #}
{% set base_yum_repo_keys = [
'https://downloads.mariadb.com/MariaDB/RPM-GPG-KEY-MariaDB',
'https://packages.treasuredata.com/GPG-KEY-td-agent',