diff options
| author | Zuul <zuul@review.opendev.org> | 2023-06-23 08:52:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-06-23 08:52:31 +0000 |
| commit | f89cb612e089de71ac8283d45e41ab3d3ddc24c8 (patch) | |
| tree | 73d3768b24c0e50521a336ba1d283810e43472aa /docker | |
| parent | d88074b6238510daf9b0800efa27d7caccd7f080 (diff) | |
| parent | 1dba21d012884e2d101b635787c7233fb27b060b (diff) | |
| download | kolla-f89cb612e089de71ac8283d45e41ab3d3ddc24c8.tar.gz kolla-f89cb612e089de71ac8283d45e41ab3d3ddc24c8.zip | |
Merge "Revert "rabbitmq: pin to 3.11.16""
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/apt_preferences.debian | 2 | ||||
| -rw-r--r-- | docker/base/apt_preferences.ubuntu | 2 | ||||
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/rabbitmq/Dockerfile.j2 | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian index f2b0a7d0f..fb93b2128 100644 --- a/docker/base/apt_preferences.debian +++ b/docker/base/apt_preferences.debian @@ -1,5 +1,5 @@ Package: rabbitmq-server -Pin: version 3.11.16-1 +Pin: version 3.11.* Pin-Priority: 1000 # NOTE(hrw): we do not want backports unless requested diff --git a/docker/base/apt_preferences.ubuntu b/docker/base/apt_preferences.ubuntu index dbee137dd..a9e30b7ca 100644 --- a/docker/base/apt_preferences.ubuntu +++ b/docker/base/apt_preferences.ubuntu @@ -1,5 +1,5 @@ Package: rabbitmq-server -Pin: version 3.11.16-1 +Pin: version 3.11.* Pin-Priority: 1000 Package: * diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 7d4804c31..def4792fc 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -32,7 +32,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'openssl-devel', 'openvswitch', 'python3-devel', - 'rabbitmq-server-3.11.16' + 'rabbitmq-server-3.11.*' ] %} {% elif base_package_type == 'deb' %} diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2 index e5ba8a3a8..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.16' + 'rabbitmq-server-3.11.*' ] %} {% elif base_package_type == 'deb' %} |