openstack
/
kolla
Code Issues Proposed changes

grafana: remove SHA1 workaround 

Change-Id: I08fe2827bc58baa95d396daf28de1079e3df4f77
(cherry picked from commit 47a9a81859)
This commit is contained in:
Michal Nasiadka 2023-01-02 12:14:12 +01:00 committed by Marcin Juszkiewicz
parent d34ae7edb1
commit ff29af45d7
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/base/Dockerfile.j2
View File

@ -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',

5
docker/grafana/Dockerfile.j2
View File

@ -13,11 +13,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='grafana', homedir='/usr/share/grafana') }}
{# NOTE(hrw): RHEL 9 disallows SHA1 gpg keys but grafana still not updated #}
{% if base_package_type == 'rpm' %}
RUN update-crypto-policies --set DEFAULT:SHA1
{% endif %}
{{ macros.install_packages(grafana_packages | customizable("packages")) }}
WORKDIR /usr/share/grafana