diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2022-02-03 13:55:59 +0100 |
|---|---|---|
| committer | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2022-02-09 17:26:39 +0000 |
| commit | 732860302cebbccc7344d2e4c345d26259ab979d (patch) | |
| tree | a9268ddd3d1b785521ed8ff8657583cecd3b404c /docker | |
| parent | f943c7d773a280b832dde9edf9d615540b259b5c (diff) | |
| download | kolla-732860302cebbccc7344d2e4c345d26259ab979d.tar.gz kolla-732860302cebbccc7344d2e4c345d26259ab979d.zip | |
rabbitmq: update to 3.9
Also update Erlang to 24
Change-Id: Ifbaccc54896bab096a6d16dc7733941dd600cf39
Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/828594
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/apt_preferences.debian | 5 | ||||
| -rw-r--r-- | docker/base/apt_preferences.ubuntu | 4 | ||||
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/rabbitmq/Dockerfile.j2 | 4 |
4 files changed, 8 insertions, 9 deletions
diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian index 0ccc2e016..f77258d05 100644 --- a/docker/base/apt_preferences.debian +++ b/docker/base/apt_preferences.debian @@ -1,10 +1,9 @@ Package: rabbitmq-server -Pin: version 3.8.* +Pin: version 3.9.* Pin-Priority: 1000 -# RabbitMQ wants 23+ and we want to stay on 23 if possible Package: erlang* -Pin: version 1:23.* +Pin: version 1:24.* 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 fd8609d94..76334e51b 100644 --- a/docker/base/apt_preferences.ubuntu +++ b/docker/base/apt_preferences.ubuntu @@ -1,9 +1,9 @@ Package: rabbitmq-server -Pin: version 3.8.* +Pin: version 3.9.* Pin-Priority: 1000 Package: erlang* -Pin: version 1:23.* +Pin: version 1:24.* Pin-Priority: 1000 # NOTE(mgoddard): logstash 7.9.x is the last version that supports diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index c1d7779d6..150dc5ab9 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -24,7 +24,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set kolla_toolbox_packages = [ 'crudini', - 'erlang-23.*', + 'erlang-24.*', 'gcc', 'gdisk', 'git', @@ -37,7 +37,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'openssl-devel', 'openvswitch', 'python3-devel', - 'rabbitmq-server-3.8.*' + 'rabbitmq-server-3.9.*' ] %} {% elif base_package_type == 'deb' %} diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2 index 854f0d2f3..026318492 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-23.*', + 'erlang-24.*', 'hostname', - 'rabbitmq-server-3.8.*' + 'rabbitmq-server-3.9.*' ] %} {% elif base_package_type == 'deb' %} |