openstack
/
kolla
Code Issues Proposed changes

Merge "Move apt_prefs pins to respective images"

This commit is contained in:
Zuul 2024-04-26 17:24:26 +00:00 committed by Gerrit Code Review
parent e47e24c946 6e1ddf5a7b
commit c4225f35ee
5 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docker/base/apt_preferences.debian
View File

@ -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

8
docker/base/apt_preferences.ubuntu
View File

@ -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

6
docker/rabbitmq/Dockerfile.j2
View File

@ -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' %}

7
docker/rabbitmq/apt_preferences_rabbitmq.debian Normal file
View File

@ -0,0 +1,7 @@
Package: rabbitmq-server
Pin: version 3.13.*
Pin-Priority: 1000
Package: erlang
Pin: version 26.2.*
Pin-Priority: 1000

7
docker/rabbitmq/apt_preferences_rabbitmq.ubuntu Normal file
View File

@ -0,0 +1,7 @@
Package: rabbitmq-server
Pin: version 3.13.*
Pin-Priority: 1000
Package: erlang
Pin: version 26.2.*
Pin-Priority: 1000