aboutsummaryrefslogtreecommitdiff
path: root/docker/base
diff options
context:
space:
mode:
Diffstat (limited to 'docker/base')
-rw-r--r--docker/base/apt_preferences.debian1
-rw-r--r--docker/base/apt_preferences.ubuntu1
-rw-r--r--docker/base/rabbitmq_rabbitmq-erlang-aarch64.repo1
-rw-r--r--docker/base/rabbitmq_rabbitmq-erlang.repo1
-rw-r--r--docker/base/rabbitmq_rabbitmq-server.repo5
5 files changed, 0 insertions, 9 deletions
diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian
index 6cd3b7719..5f341ae30 100644
--- a/docker/base/apt_preferences.debian
+++ b/docker/base/apt_preferences.debian
@@ -8,7 +8,6 @@ Package: smartmontools
Pin: version 7.*
Pin-Priority: 1000
-# We do not pin minor versions anymore
Package: rabbitmq-server
Pin: version 3.8.*
Pin-Priority: 1000
diff --git a/docker/base/apt_preferences.ubuntu b/docker/base/apt_preferences.ubuntu
index db1c1d4ed..9792854d5 100644
--- a/docker/base/apt_preferences.ubuntu
+++ b/docker/base/apt_preferences.ubuntu
@@ -1,4 +1,3 @@
-# We do not pin minor versions anymore
Package: rabbitmq-server
Pin: version 3.8.*
Pin-Priority: 1000
diff --git a/docker/base/rabbitmq_rabbitmq-erlang-aarch64.repo b/docker/base/rabbitmq_rabbitmq-erlang-aarch64.repo
index a084c74c2..2d6b5b073 100644
--- a/docker/base/rabbitmq_rabbitmq-erlang-aarch64.repo
+++ b/docker/base/rabbitmq_rabbitmq-erlang-aarch64.repo
@@ -1,7 +1,6 @@
[rabbitmq_rabbitmq-erlang]
name=rabbitmq_rabbitmq-erlang
baseurl=http://obs.linaro.org/home:/marcin.juszkiewicz/centos$releasever/
-repo_gpgcheck=0
gpgcheck=1
enabled=0
gpgkey=http://obs.linaro.org/home:/marcin.juszkiewicz/centos$releasever/repodata/repomd.xml.key
diff --git a/docker/base/rabbitmq_rabbitmq-erlang.repo b/docker/base/rabbitmq_rabbitmq-erlang.repo
index a3ecea85c..c9d9aed42 100644
--- a/docker/base/rabbitmq_rabbitmq-erlang.repo
+++ b/docker/base/rabbitmq_rabbitmq-erlang.repo
@@ -1,7 +1,6 @@
[rabbitmq_rabbitmq-erlang]
name=rabbitmq_rabbitmq-erlang
baseurl=https://dl.bintray.com/rabbitmq-erlang/rpm/erlang/22/el/$releasever/
-repo_gpgcheck=0
gpgcheck=1
enabled=0
gpgkey=https://www.rabbitmq.com/rabbitmq-release-signing-key.asc
diff --git a/docker/base/rabbitmq_rabbitmq-server.repo b/docker/base/rabbitmq_rabbitmq-server.repo
index 2a04f4521..50f307d86 100644
--- a/docker/base/rabbitmq_rabbitmq-server.repo
+++ b/docker/base/rabbitmq_rabbitmq-server.repo
@@ -1,11 +1,6 @@
[rabbitmq_rabbitmq-server]
name=rabbitmq_rabbitmq-server
baseurl=https://dl.bintray.com/rabbitmq/rpm/rabbitmq-server/v3.8.x/el/$releasever/
-# NOTE(mgoddard): rabbitmq-server 3.7 packages are not signed. Previously
-# repo_gpgcheck was set to 1, but this breaks DNF which does not seem to accept
-# keys imported by rpm --import for signing a repo (as opposed to packages).
-# TODO(mgoddard): Set gpgcheck=1 for rabbitmq-server 3.8+
-repo_gpgcheck=0
gpgcheck=1
enabled=0
gpgkey=https://www.rabbitmq.com/rabbitmq-release-signing-key.asc