openstack
/
kolla
Code Issues Proposed changes

Merge "CentOS: move gpg keys to repo files"

This commit is contained in:
Zuul 2023-01-03 19:48:50 +00:00 committed by Gerrit Code Review
parent 9165807446 d73dc618aa
commit caed231ae4
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/base/Dockerfile.j2
View File

@ -79,10 +79,6 @@ SHA1 keys are not supported in RHEL9: https://github.com/rpm-software-management
'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',
'https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc',
'https://repos.influxdata.com/influxdb.key',
] %}
{% if base_arch == 'x86_64' %}

1
docker/base/mariadb.repo
View File

@ -4,3 +4,4 @@ baseurl = https://dlm.mariadb.com/repo/mariadb-server/10.6/yum/rhel/$releasever/
gpgcheck = 1
enabled = 0
module_hotfixes = 1
gpgkey = https://downloads.mariadb.com/MariaDB/RPM-GPG-KEY-MariaDB

1
docker/base/rabbitmq_rabbitmq-erlang.repo
View File

@ -4,3 +4,4 @@ name=rabbitmq_rabbitmq-erlang
baseurl=https://packagecloud.io/rabbitmq/erlang/el/8/$basearch
gpgcheck=1
enabled=0
gpgkey = https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc

1
docker/base/rabbitmq_rabbitmq-server.repo
View File

@ -3,3 +3,4 @@ name=rabbitmq_rabbitmq-server
baseurl=https://packagecloud.io/rabbitmq/rabbitmq-server/el/8/$basearch
gpgcheck=1
enabled=0
gpgkey = https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc