diff options
| author | Zuul <zuul@review.opendev.org> | 2023-01-03 19:48:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-01-03 19:48:50 +0000 |
| commit | caed231ae4f22eaa2b71b6921e8a0b7ebb6e6983 (patch) | |
| tree | 784041b9876e7a6b2bb02f5ce81cd9c2645ab697 | |
| parent | 916580744679295a80790e6d591286bc9cf23077 (diff) | |
| parent | d73dc618aa6b20727ca7d1fc1e9dc5905201869c (diff) | |
| download | kolla-caed231ae4f22eaa2b71b6921e8a0b7ebb6e6983.tar.gz kolla-caed231ae4f22eaa2b71b6921e8a0b7ebb6e6983.zip | |
Merge "CentOS: move gpg keys to repo files"
| -rw-r--r-- | docker/base/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/base/mariadb.repo | 1 | ||||
| -rw-r--r-- | docker/base/rabbitmq_rabbitmq-erlang.repo | 1 | ||||
| -rw-r--r-- | docker/base/rabbitmq_rabbitmq-server.repo | 1 |
4 files changed, 3 insertions, 4 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 2d9ade3c9..a42954c11 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -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' %} diff --git a/docker/base/mariadb.repo b/docker/base/mariadb.repo index 43ea786a5..24489500f 100644 --- a/docker/base/mariadb.repo +++ b/docker/base/mariadb.repo @@ -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 diff --git a/docker/base/rabbitmq_rabbitmq-erlang.repo b/docker/base/rabbitmq_rabbitmq-erlang.repo index 59d49c492..a5f5d217b 100644 --- a/docker/base/rabbitmq_rabbitmq-erlang.repo +++ b/docker/base/rabbitmq_rabbitmq-erlang.repo @@ -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 diff --git a/docker/base/rabbitmq_rabbitmq-server.repo b/docker/base/rabbitmq_rabbitmq-server.repo index 0bbf8a82f..a243f9d78 100644 --- a/docker/base/rabbitmq_rabbitmq-server.repo +++ b/docker/base/rabbitmq_rabbitmq-server.repo @@ -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 |