diff options
| author | Zuul <zuul@review.opendev.org> | 2023-04-01 16:46:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-04-01 16:46:26 +0000 |
| commit | 32922bbbaedd6aa257225674acc6252905cb5af0 (patch) | |
| tree | ab58e85b693c524cce46fc3286c9398ba39dcf03 | |
| parent | 143765fb67221cc51f1dc56a41ac2b67dddc453f (diff) | |
| parent | dbde2a8cdc991decf8b6f3d148bf651a49d6a1c8 (diff) | |
| download | kolla-32922bbbaedd6aa257225674acc6252905cb5af0.tar.gz kolla-32922bbbaedd6aa257225674acc6252905cb5af0.zip | |
Merge "Revert "rabbitmq: Pin to 3.11.11""
| -rw-r--r-- | docker/base/apt_preferences.debian | 2 | ||||
| -rw-r--r-- | docker/base/apt_preferences.ubuntu | 2 | ||||
| -rw-r--r-- | docker/rabbitmq/Dockerfile.j2 | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian index 4896bd9c4..80670698c 100644 --- a/docker/base/apt_preferences.debian +++ b/docker/base/apt_preferences.debian @@ -1,5 +1,5 @@ Package: rabbitmq-server -Pin: version 3.11.11-1 +Pin: version 3.11.* Pin-Priority: 1000 Package: erlang* diff --git a/docker/base/apt_preferences.ubuntu b/docker/base/apt_preferences.ubuntu index 5112fa818..81e651620 100644 --- a/docker/base/apt_preferences.ubuntu +++ b/docker/base/apt_preferences.ubuntu @@ -1,5 +1,5 @@ Package: rabbitmq-server -Pin: version 3.11.11-1 +Pin: version 3.11.* Pin-Priority: 1000 Package: erlang* diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2 index c2cfa93c0..c17cf0a19 100644 --- a/docker/rabbitmq/Dockerfile.j2 +++ b/docker/rabbitmq/Dockerfile.j2 @@ -16,7 +16,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set rabbitmq_packages = [ 'erlang-25.*', - 'rabbitmq-server-3.11.11' + 'rabbitmq-server-3.11.*' ] %} {% elif base_package_type == 'deb' %} |