diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2023-01-02 12:14:12 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org> | 2023-01-18 07:39:30 +0100 |
| commit | 47a9a818596b27f658fb7b40aac2130fd04b66b6 (patch) | |
| tree | bec382ff1dd49a661acbb6224c91631fb7a936e3 | |
| parent | a840ac0d7c8777a8198ae40cbb79b65c5fffd7e1 (diff) | |
| download | kolla-47a9a818596b27f658fb7b40aac2130fd04b66b6.tar.gz kolla-47a9a818596b27f658fb7b40aac2130fd04b66b6.zip | |
grafana: remove SHA1 workaround
Change-Id: I08fe2827bc58baa95d396daf28de1079e3df4f77
| -rw-r--r-- | docker/base/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/grafana/Dockerfile.j2 | 5 |
2 files changed, 0 insertions, 9 deletions
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 |