Merge "Move apt_prefs pins to respective images"

Zuul · openstack-gerrit · commit c4225f35eef2 · 2024-04-26T17:24:26.000Z
diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian
@@ -1,11 +1,3 @@
-Package: rabbitmq-server
-Pin: version 3.13.*
-Pin-Priority: 1000
-
-Package: erlang
-Pin: version 26.2.*
-Pin-Priority: 1000
-
 # NOTE(hrw): we do not want backports unless requested
 Package: *
 Pin: release n=bookworm-backports
diff --git a/docker/base/apt_preferences.ubuntu b/docker/base/apt_preferences.ubuntu
@@ -1,11 +1,3 @@
-Package: rabbitmq-server
-Pin: version 3.13.*
-Pin-Priority: 1000
-
-Package: erlang
-Pin: version 26.2.*
-Pin-Priority: 1000
-
 Package: *
 Pin: origin dlm.mariadb.com
 Pin-Priority: 1000
diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2
@@ -11,6 +11,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {{ macros.enable_extra_repos(['crb', 'erlang', 'rabbitmq']) }}
 
+{% block rabbitmq_apt_preferences %}
+{% if base_package_type == 'deb' %}
+COPY apt_preferences_rabbitmq.{{ base_distro }} /etc/apt/preferences.d/rabbitmq
+{% endif %}
+{% endblock %}
+
 {% block rabbitmq_install %}
 {% if base_package_type == 'rpm' %}
 
diff --git a/docker/rabbitmq/apt_preferences_rabbitmq.debian b/docker/rabbitmq/apt_preferences_rabbitmq.debian
@@ -0,0 +1,7 @@
+Package: rabbitmq-server
+Pin: version 3.13.*
+Pin-Priority: 1000
+
+Package: erlang
+Pin: version 26.2.*
+Pin-Priority: 1000
diff --git a/docker/rabbitmq/apt_preferences_rabbitmq.ubuntu b/docker/rabbitmq/apt_preferences_rabbitmq.ubuntu
@@ -0,0 +1,7 @@
+Package: rabbitmq-server
+Pin: version 3.13.*
+Pin-Priority: 1000
+
+Package: erlang
+Pin: version 26.2.*
+Pin-Priority: 1000
