From 47a9a818596b27f658fb7b40aac2130fd04b66b6 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Mon, 2 Jan 2023 12:14:12 +0100 Subject: grafana: remove SHA1 workaround Change-Id: I08fe2827bc58baa95d396daf28de1079e3df4f77 --- docker/base/Dockerfile.j2 | 4 ---- docker/grafana/Dockerfile.j2 | 5 ----- 2 files changed, 9 deletions(-) (limited to 'docker') diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index a42954c11..db52c02d1 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 = [ ] %} diff --git a/docker/grafana/Dockerfile.j2 b/docker/grafana/Dockerfile.j2 index ccd372389..63674fa2e 100644 --- a/docker/grafana/Dockerfile.j2 +++ b/docker/grafana/Dockerfile.j2 @@ -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 -- cgit v1.2.3