diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 3153e4f6d7..c299f85924 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -93,7 +93,7 @@ COPY dnf.conf /etc/dnf/dnf.conf {% elif base_arch == 'aarch64' %} {% set base_yum_repo_files = [ 'elasticsearch.repo', - 'erlang-solutions.repo', + 'hrw-copr-erlang-for-rabbitmq.repo', 'grafana.repo', 'rabbitmq_rabbitmq-server.repo', 'td.repo', @@ -356,8 +356,8 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom {# 901F9177AB97ACBE -- Treasure Data, Inc (Treasure Agent Official Signing key) #} {# A20F259AEB9C94BB -- Sensuapp (Freight) #} {# F1656F24C74CD1D8 -- MariaDB Signing Key #} - {# E495BB49CC4BBE5B -- Cloudsmith RabbitMQ Erlang repository key #} {# 9F4587F226208342 -- Cloudsmith RabbitMQ repository key #} + {# F77F1EDA57EBB1CC -- Team RabbitMQ Erlang PPA #} {% set base_apt_keys = [ '391A9AA2147192839E9DB0315EDB1B62EC4926EA', '46095ACC8548582C1A2699A9D27D666CD88E42B4', @@ -367,8 +367,8 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom '901F9177AB97ACBE', 'A20F259AEB9C94BB', 'F1656F24C74CD1D8', - 'E495BB49CC4BBE5B', '9F4587F226208342', + 'F77F1EDA57EBB1CC', ] %} {% set base_remote_apt_keys = [ 'https://packages.grafana.com/gpg.key', @@ -378,8 +378,8 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom {% set base_apt_keys = [ '46095ACC8548582C1A2699A9D27D666CD88E42B4', 'F1656F24C74CD1D8', - 'E495BB49CC4BBE5B', '9F4587F226208342', + 'F77F1EDA57EBB1CC', ] %} {% set base_remote_apt_keys = [ 'https://download.docker.com/linux/debian/gpg', diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian index 488820223c..d61b18bdcd 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: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 fd8609d942..d61b18bdcd 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:25.* Pin-Priority: 1000 # NOTE(mgoddard): logstash 7.9.x is the last version that supports diff --git a/docker/base/erlang-solutions.repo b/docker/base/erlang-solutions.repo deleted file mode 100644 index 4adbe680fc..0000000000 --- a/docker/base/erlang-solutions.repo +++ /dev/null @@ -1,6 +0,0 @@ -[erlang-solutions] -name=erlang-solutions -baseurl=https://packages.erlang-solutions.com/rpm/centos/$releasever/$basearch -gpgcheck=1 -gpgkey=https://packages.erlang-solutions.com/rpm/erlang_solutions.asc -enabled=0 diff --git a/docker/base/hrw-copr-erlang-for-rabbitmq.repo b/docker/base/hrw-copr-erlang-for-rabbitmq.repo new file mode 100644 index 0000000000..d06e114645 --- /dev/null +++ b/docker/base/hrw-copr-erlang-for-rabbitmq.repo @@ -0,0 +1,11 @@ +# NOTE(hrw): this repository contains rebuild of Erlang package from RabbitMQ team +# from https://github.com/rabbitmq/erlang-rpm/ +# Thanks to COPR we have aarch64 packages for CentOS Stream 8/9 + +[copr-hrw-erlang-for-rabbitmq] +name=Hrw's COPR with Erlang build for RabbitMQ +baseurl=https://download.copr.fedorainfracloud.org/results/hrw/erlang-for-rabbitmq/centos-stream-$releasever-$basearch/ +gpgcheck=1 +enabled=0 +gpgkey=https://download.copr.fedorainfracloud.org/results/hrw/erlang-for-rabbitmq/pubkey.gpg +repo_gpgcheck=0 diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index da1d2d2933..77082b9463 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-25.*', 'gcc', 'gdisk', 'git', @@ -39,7 +39,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 854f0d2f38..0a3180691e 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-25.*', 'hostname', - 'rabbitmq-server-3.8.*' + 'rabbitmq-server-3.9.*' ] %} {% elif base_package_type == 'deb' %} diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index 609a0cd655..99f9ab035c 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -24,7 +24,7 @@ centos-aarch64: elasticsearch: "elasticsearch-kibana-logstash-7.x" epel: "epel" epel-modular: "epel-modular" - erlang: "erlang-solutions" + erlang: "copr-hrw-erlang-for-rabbitmq" extras: "extras" grafana: "grafana" hacluster: "ha" @@ -59,7 +59,7 @@ rhel: debian: elasticsearch: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main" - erlang: "deb https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb/debian bullseye main" + erlang: "deb https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu focal main" grafana: "deb https://packages.grafana.com/oss/deb stable main" influxdb: "deb https://repos.influxdata.com/debian bullseye stable" logstash: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main" @@ -70,7 +70,7 @@ debian: debian-aarch64: elasticsearch: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main" - erlang: "deb https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb/debian bullseye main" + erlang: "deb https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu focal main" grafana: "deb https://packages.grafana.com/oss/deb stable main" influxdb: "deb https://repos.influxdata.com/debian bullseye stable" logstash: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main" @@ -81,7 +81,7 @@ debian-aarch64: ubuntu: elasticsearch: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main" - erlang: "deb https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb/ubuntu focal main" + erlang: "deb https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu focal main" grafana: "deb https://packages.grafana.com/oss/deb stable main" influxdb: "deb https://repos.influxdata.com/ubuntu focal stable" logstash: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main" @@ -93,7 +93,7 @@ ubuntu: ubuntu-aarch64: elasticsearch: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main" - erlang: "deb https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb/ubuntu focal main" + erlang: "deb https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu focal main" grafana: "deb https://packages.grafana.com/oss/deb stable main" influxdb: "deb https://repos.influxdata.com/ubuntu focal stable" logstash: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"