diff options
| author | Zuul <zuul@review.opendev.org> | 2022-08-30 06:58:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-08-30 06:58:25 +0000 |
| commit | 0eb36f0d8890f592cbecea99c5a77e42746a6d95 (patch) | |
| tree | cac563737915bda3ba7cc56cc6e97f36fa59e747 /docker | |
| parent | 91c2cc0d8d4caf8fa6567b95d8f7e7b4fc4dd443 (diff) | |
| parent | 1c0af66bfd692b9832e2b8a3d26d64a6f93b3475 (diff) | |
| download | kolla-0eb36f0d8890f592cbecea99c5a77e42746a6d95.tar.gz kolla-0eb36f0d8890f592cbecea99c5a77e42746a6d95.zip | |
Merge "rabbitmq: Update to 3.10"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/apt_preferences.debian | 4 | ||||
| -rw-r--r-- | docker/base/apt_preferences.ubuntu | 4 | ||||
| -rw-r--r-- | docker/rabbitmq/Dockerfile.j2 | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian index 4c27082d4..24b13e190 100644 --- a/docker/base/apt_preferences.debian +++ b/docker/base/apt_preferences.debian @@ -1,9 +1,9 @@ Package: rabbitmq-server -Pin: version 3.9.* +Pin: version 3.10.* Pin-Priority: 1000 Package: erlang* -Pin: version 1:24.* +Pin: version 1:25.* Pin-Priority: 1000 # NOTE(mgoddard): logstash 7.9.x is the last version that supports diff --git a/docker/base/apt_preferences.ubuntu b/docker/base/apt_preferences.ubuntu index 09a89ee44..d6a262861 100644 --- a/docker/base/apt_preferences.ubuntu +++ b/docker/base/apt_preferences.ubuntu @@ -1,9 +1,9 @@ Package: rabbitmq-server -Pin: version 3.9.* +Pin: version 3.10.* Pin-Priority: 1000 Package: erlang* -Pin: version 1:24.* +Pin: version 1:25.* Pin-Priority: 1000 # NOTE(mgoddard): logstash 7.9.x is the last version that supports diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2 index 6dd08ef3f..8bfa6f579 100644 --- a/docker/rabbitmq/Dockerfile.j2 +++ b/docker/rabbitmq/Dockerfile.j2 @@ -20,9 +20,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_package_type == 'rpm' %} {% set rabbitmq_packages = [ - 'erlang-24.*', + 'erlang-25.*', 'hostname', - 'rabbitmq-server-3.9.*' + 'rabbitmq-server-3.10.*' ] %} {% elif base_package_type == 'deb' %} |