diff options
| author | Zuul <zuul@review.opendev.org> | 2024-04-26 17:24:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2024-04-26 17:24:26 +0000 |
| commit | c4225f35eef2f9ff590dfb1726579bfce2b1c1a0 (patch) | |
| tree | 32120b58284ec94652e05ae2b611fb742dc1d209 | |
| parent | e47e24c9463b6f3dce177f7436376c2b3413c4de (diff) | |
| parent | 6e1ddf5a7b0ccd89890cb3756a9ef88e2ff9c629 (diff) | |
| download | kolla-c4225f35eef2f9ff590dfb1726579bfce2b1c1a0.tar.gz kolla-c4225f35eef2f9ff590dfb1726579bfce2b1c1a0.zip | |
Merge "Move apt_prefs pins to respective images"
| -rw-r--r-- | docker/base/apt_preferences.debian | 8 | ||||
| -rw-r--r-- | docker/base/apt_preferences.ubuntu | 8 | ||||
| -rw-r--r-- | docker/rabbitmq/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | docker/rabbitmq/apt_preferences_rabbitmq.debian | 7 | ||||
| -rw-r--r-- | docker/rabbitmq/apt_preferences_rabbitmq.ubuntu | 7 |
5 files changed, 20 insertions, 16 deletions
diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian index 99d2c9a4d..5edb8814a 100644 --- 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 index 64b589362..7cc49b4ad 100644 --- 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 index 444f29b50..266b99db1 100644 --- 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 new file mode 100644 index 000000000..0e71a4d36 --- /dev/null +++ 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 new file mode 100644 index 000000000..0e71a4d36 --- /dev/null +++ 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 |