diff options
| author | Zuul <zuul@review.opendev.org> | 2025-06-02 23:16:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2025-06-02 23:16:00 +0000 |
| commit | 7db1ac8f6d07008550ac7d3f36b35d4de6d6f340 (patch) | |
| tree | 872b26c90c7b5a27927c2b8278f2d58762517f89 /docker | |
| parent | cea5658fdbba91ae387e8d5e9d19401014fcba56 (diff) | |
| parent | c9b665fa8a1ba38f6798349019714ae174b9b85b (diff) | |
| download | kolla-7db1ac8f6d07008550ac7d3f36b35d4de6d6f340.tar.gz kolla-7db1ac8f6d07008550ac7d3f36b35d4de6d6f340.zip | |
Merge "rabbitmq: Update to 4.1"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/rabbitmq/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/rabbitmq/apt_preferences_rabbitmq.debian | 4 | ||||
| -rw-r--r-- | docker/rabbitmq/apt_preferences_rabbitmq.ubuntu | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 0e057871c..cc8ae1b55 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -24,7 +24,7 @@ COPY apt_preferences_rabbitmq.{{ base_distro }} /etc/apt/preferences.d/rabbitmq {% if base_package_type == 'rpm' %} {% set kolla_toolbox_packages = [ 'crudini', - 'erlang-26.2.*', + 'erlang-27.*', 'gcc', 'gdisk', 'git', @@ -38,7 +38,7 @@ COPY apt_preferences_rabbitmq.{{ base_distro }} /etc/apt/preferences.d/rabbitmq 'openvswitch', 'python3.12', 'python3.12-devel', - 'rabbitmq-server-4.0.*' + 'rabbitmq-server-4.1.*' ] %} {% elif base_package_type == 'deb' %} diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2 index 194e212f5..3ff00eef7 100644 --- a/docker/rabbitmq/Dockerfile.j2 +++ b/docker/rabbitmq/Dockerfile.j2 @@ -21,8 +21,8 @@ COPY apt_preferences_rabbitmq.{{ base_distro }} /etc/apt/preferences.d/rabbitmq {% if base_package_type == 'rpm' %} {% set rabbitmq_packages = [ - 'erlang-26.2.*', - 'rabbitmq-server-4.0.*' + 'erlang-27.*', + 'rabbitmq-server-4.1.*' ] %} {% elif base_package_type == 'deb' %} diff --git a/docker/rabbitmq/apt_preferences_rabbitmq.debian b/docker/rabbitmq/apt_preferences_rabbitmq.debian index 52b851f65..0c254e0ac 100644 --- a/docker/rabbitmq/apt_preferences_rabbitmq.debian +++ b/docker/rabbitmq/apt_preferences_rabbitmq.debian @@ -1,7 +1,7 @@ Package: rabbitmq-server -Pin: version 4.0.* +Pin: version 4.1.* Pin-Priority: 1000 Package: erlang -Pin: version 26.2.* +Pin: version 27.* Pin-Priority: 1000 diff --git a/docker/rabbitmq/apt_preferences_rabbitmq.ubuntu b/docker/rabbitmq/apt_preferences_rabbitmq.ubuntu index 52b851f65..0c254e0ac 100644 --- a/docker/rabbitmq/apt_preferences_rabbitmq.ubuntu +++ b/docker/rabbitmq/apt_preferences_rabbitmq.ubuntu @@ -1,7 +1,7 @@ Package: rabbitmq-server -Pin: version 4.0.* +Pin: version 4.1.* Pin-Priority: 1000 Package: erlang -Pin: version 26.2.* +Pin: version 27.* Pin-Priority: 1000 |