diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2024-03-05 12:58:42 +0100 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2024-03-11 15:11:54 +0000 |
| commit | a0e22caa8a131486de6cbcf0a4d9b13c6e7c0547 (patch) | |
| tree | 2f761097d6d745dfc0acb10f018d8053ae8265eb /docker | |
| parent | f18b9142ade246624467ca71310d28ce5743bd10 (diff) | |
| download | kolla-a0e22caa8a131486de6cbcf0a4d9b13c6e7c0547.tar.gz kolla-a0e22caa8a131486de6cbcf0a4d9b13c6e7c0547.zip | |
Bump rabbitmq to 3.13
Pinning Erlang to 26.2.* (max supported version as per [1]),
so we don't break this in future when Erlang 26.3 becomes
available.
[1]: https://rabbitmq-website.pages.dev/docs/which-erlang
Change-Id: I1fd03a67914386129d7b0bb9be6aca86982f98f3
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/apt_preferences.debian | 6 | ||||
| -rw-r--r-- | docker/base/apt_preferences.ubuntu | 6 | ||||
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/rabbitmq/Dockerfile.j2 | 4 |
4 files changed, 14 insertions, 6 deletions
diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian index 394fff1fe..99d2c9a4d 100644 --- a/docker/base/apt_preferences.debian +++ b/docker/base/apt_preferences.debian @@ -1,5 +1,9 @@ Package: rabbitmq-server -Pin: version 3.12.* +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 diff --git a/docker/base/apt_preferences.ubuntu b/docker/base/apt_preferences.ubuntu index 9c6eae9b1..64b589362 100644 --- a/docker/base/apt_preferences.ubuntu +++ b/docker/base/apt_preferences.ubuntu @@ -1,5 +1,9 @@ Package: rabbitmq-server -Pin: version 3.12.* +Pin: version 3.13.* +Pin-Priority: 1000 + +Package: erlang +Pin: version 26.2.* Pin-Priority: 1000 Package: * diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 273ddb4e7..c5e17a20e 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -19,7 +19,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set kolla_toolbox_packages = [ 'crudini', - 'erlang-26.*', + 'erlang-26.2.*', 'gcc', 'gdisk', 'git', @@ -32,7 +32,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'openssl-devel', 'openvswitch', 'python3-devel', - 'rabbitmq-server-3.12.*' + 'rabbitmq-server-3.13.*' ] %} {% elif base_package_type == 'deb' %} diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2 index e6dacba04..444f29b50 100644 --- a/docker/rabbitmq/Dockerfile.j2 +++ b/docker/rabbitmq/Dockerfile.j2 @@ -15,8 +15,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_package_type == 'rpm' %} {% set rabbitmq_packages = [ - 'erlang-26.*', - 'rabbitmq-server-3.12.*' + 'erlang-26.2.*', + 'rabbitmq-server-3.13.*' ] %} {% elif base_package_type == 'deb' %} |