diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 8a39345e57..0401aa2d18 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -13,7 +13,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='ansible') }} {{ macros.configure_user(name='rabbitmq') }} -{{ macros.enable_extra_repos(['crb', 'erlang', 'openvswitch', 'rabbitmq']) }} +{{ macros.enable_extra_repos(['crb', 'erlang', 'erlang-25', 'openvswitch', 'rabbitmq']) }} {% block rabbitmq_apt_preferences %} {% if base_package_type == 'deb' %} diff --git a/docker/kolla-toolbox/apt_preferences_rabbitmq.debian b/docker/kolla-toolbox/apt_preferences_rabbitmq.debian index f1cc84d9be..9a64135be7 120000 --- a/docker/kolla-toolbox/apt_preferences_rabbitmq.debian +++ b/docker/kolla-toolbox/apt_preferences_rabbitmq.debian @@ -1 +1 @@ -../rabbitmq/apt_preferences_rabbitmq.debian \ No newline at end of file +../rabbitmq/rabbitmq/apt_preferences_rabbitmq.debian \ No newline at end of file diff --git a/docker/kolla-toolbox/apt_preferences_rabbitmq.ubuntu b/docker/kolla-toolbox/apt_preferences_rabbitmq.ubuntu index f1cc84d9be..42678842e8 120000 --- a/docker/kolla-toolbox/apt_preferences_rabbitmq.ubuntu +++ b/docker/kolla-toolbox/apt_preferences_rabbitmq.ubuntu @@ -1 +1 @@ -../rabbitmq/apt_preferences_rabbitmq.debian \ No newline at end of file +../rabbitmq/rabbitmq/apt_preferences_rabbitmq.ubuntu \ No newline at end of file diff --git a/docker/rabbitmq/rabbitmq-3-12/Dockerfile.j2 b/docker/rabbitmq/rabbitmq-3-12/Dockerfile.j2 new file mode 120000 index 0000000000..9f7f5a164f --- /dev/null +++ b/docker/rabbitmq/rabbitmq-3-12/Dockerfile.j2 @@ -0,0 +1 @@ +../rabbitmq/Dockerfile.j2 \ No newline at end of file diff --git a/docker/rabbitmq/rabbitmq-3-12/apt_preferences_rabbitmq.debian b/docker/rabbitmq/rabbitmq-3-12/apt_preferences_rabbitmq.debian new file mode 100644 index 0000000000..75b11bf19d --- /dev/null +++ b/docker/rabbitmq/rabbitmq-3-12/apt_preferences_rabbitmq.debian @@ -0,0 +1,7 @@ +Package: rabbitmq-server +Pin: version 3.12.* +Pin-Priority: 1000 + +Package: erlang* +Pin: version 1:26.* +Pin-Priority: 1000 diff --git a/docker/rabbitmq/rabbitmq-3-12/apt_preferences_rabbitmq.ubuntu b/docker/rabbitmq/rabbitmq-3-12/apt_preferences_rabbitmq.ubuntu new file mode 100644 index 0000000000..75b11bf19d --- /dev/null +++ b/docker/rabbitmq/rabbitmq-3-12/apt_preferences_rabbitmq.ubuntu @@ -0,0 +1,7 @@ +Package: rabbitmq-server +Pin: version 3.12.* +Pin-Priority: 1000 + +Package: erlang* +Pin: version 1:26.* +Pin-Priority: 1000 diff --git a/docker/rabbitmq/rabbitmq-3-12/extend_start.sh b/docker/rabbitmq/rabbitmq-3-12/extend_start.sh new file mode 120000 index 0000000000..fbcd8ff0f1 --- /dev/null +++ b/docker/rabbitmq/rabbitmq-3-12/extend_start.sh @@ -0,0 +1 @@ +../rabbitmq/extend_start.sh \ No newline at end of file diff --git a/docker/rabbitmq/rabbitmq-3-12/healthcheck_rabbitmq b/docker/rabbitmq/rabbitmq-3-12/healthcheck_rabbitmq new file mode 120000 index 0000000000..96d2cf696b --- /dev/null +++ b/docker/rabbitmq/rabbitmq-3-12/healthcheck_rabbitmq @@ -0,0 +1 @@ +../rabbitmq/healthcheck_rabbitmq \ No newline at end of file diff --git a/docker/rabbitmq/rabbitmq-3-12/rabbitmq_packages_rpm.centos b/docker/rabbitmq/rabbitmq-3-12/rabbitmq_packages_rpm.centos new file mode 100644 index 0000000000..6185fb920c --- /dev/null +++ b/docker/rabbitmq/rabbitmq-3-12/rabbitmq_packages_rpm.centos @@ -0,0 +1,4 @@ +{% set rabbitmq_packages = [ + 'erlang-26.*', + 'rabbitmq-server-3.12.*' +] %} \ No newline at end of file diff --git a/docker/rabbitmq/rabbitmq-3-12/rabbitmq_packages_rpm.rocky b/docker/rabbitmq/rabbitmq-3-12/rabbitmq_packages_rpm.rocky new file mode 100644 index 0000000000..6185fb920c --- /dev/null +++ b/docker/rabbitmq/rabbitmq-3-12/rabbitmq_packages_rpm.rocky @@ -0,0 +1,4 @@ +{% set rabbitmq_packages = [ + 'erlang-26.*', + 'rabbitmq-server-3.12.*' +] %} \ No newline at end of file diff --git a/docker/rabbitmq/rabbitmq-3-13/Dockerfile.j2 b/docker/rabbitmq/rabbitmq-3-13/Dockerfile.j2 new file mode 120000 index 0000000000..9f7f5a164f --- /dev/null +++ b/docker/rabbitmq/rabbitmq-3-13/Dockerfile.j2 @@ -0,0 +1 @@ +../rabbitmq/Dockerfile.j2 \ No newline at end of file diff --git a/docker/rabbitmq/rabbitmq-3-13/apt_preferences_rabbitmq.debian b/docker/rabbitmq/rabbitmq-3-13/apt_preferences_rabbitmq.debian new file mode 100644 index 0000000000..fed582d581 --- /dev/null +++ b/docker/rabbitmq/rabbitmq-3-13/apt_preferences_rabbitmq.debian @@ -0,0 +1,7 @@ +Package: rabbitmq-server +Pin: version 3.13.* +Pin-Priority: 1000 + +Package: erlang* +Pin: version 1:26.2.* +Pin-Priority: 1000 diff --git a/docker/rabbitmq/rabbitmq-3-13/apt_preferences_rabbitmq.ubuntu b/docker/rabbitmq/rabbitmq-3-13/apt_preferences_rabbitmq.ubuntu new file mode 100644 index 0000000000..fed582d581 --- /dev/null +++ b/docker/rabbitmq/rabbitmq-3-13/apt_preferences_rabbitmq.ubuntu @@ -0,0 +1,7 @@ +Package: rabbitmq-server +Pin: version 3.13.* +Pin-Priority: 1000 + +Package: erlang* +Pin: version 1:26.2.* +Pin-Priority: 1000 diff --git a/docker/rabbitmq/rabbitmq-3-13/extend_start.sh b/docker/rabbitmq/rabbitmq-3-13/extend_start.sh new file mode 120000 index 0000000000..fbcd8ff0f1 --- /dev/null +++ b/docker/rabbitmq/rabbitmq-3-13/extend_start.sh @@ -0,0 +1 @@ +../rabbitmq/extend_start.sh \ No newline at end of file diff --git a/docker/rabbitmq/rabbitmq-3-13/healthcheck_rabbitmq b/docker/rabbitmq/rabbitmq-3-13/healthcheck_rabbitmq new file mode 120000 index 0000000000..96d2cf696b --- /dev/null +++ b/docker/rabbitmq/rabbitmq-3-13/healthcheck_rabbitmq @@ -0,0 +1 @@ +../rabbitmq/healthcheck_rabbitmq \ No newline at end of file diff --git a/docker/rabbitmq/rabbitmq-3-13/rabbitmq_packages_rpm.centos b/docker/rabbitmq/rabbitmq-3-13/rabbitmq_packages_rpm.centos new file mode 100644 index 0000000000..5ca3e7e8fa --- /dev/null +++ b/docker/rabbitmq/rabbitmq-3-13/rabbitmq_packages_rpm.centos @@ -0,0 +1,4 @@ +{% set rabbitmq_packages = [ + 'erlang-26.2.*', + 'rabbitmq-server-3.13.*' +] %} \ No newline at end of file diff --git a/docker/rabbitmq/rabbitmq-3-13/rabbitmq_packages_rpm.rocky b/docker/rabbitmq/rabbitmq-3-13/rabbitmq_packages_rpm.rocky new file mode 100644 index 0000000000..5ca3e7e8fa --- /dev/null +++ b/docker/rabbitmq/rabbitmq-3-13/rabbitmq_packages_rpm.rocky @@ -0,0 +1,4 @@ +{% set rabbitmq_packages = [ + 'erlang-26.2.*', + 'rabbitmq-server-3.13.*' +] %} \ No newline at end of file diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/rabbitmq/Dockerfile.j2 similarity index 86% rename from docker/rabbitmq/Dockerfile.j2 rename to docker/rabbitmq/rabbitmq/Dockerfile.j2 index f2cc7e1d05..1637605410 100644 --- a/docker/rabbitmq/Dockerfile.j2 +++ b/docker/rabbitmq/rabbitmq/Dockerfile.j2 @@ -9,7 +9,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='rabbitmq') }} -{{ macros.enable_extra_repos(['crb', 'erlang', 'rabbitmq']) }} +{{ macros.enable_extra_repos(['crb', 'erlang', 'erlang-25', 'erlang-26', 'rabbitmq']) }} {% block rabbitmq_apt_preferences %} {% if base_package_type == 'deb' %} @@ -20,10 +20,8 @@ COPY apt_preferences_rabbitmq.{{ base_distro }} /etc/apt/preferences.d/rabbitmq {% block rabbitmq_install %} {% if base_package_type == 'rpm' %} - {% set rabbitmq_packages = [ - 'erlang-25.*', - 'rabbitmq-server-3.11.*' - ] %} + {% set filepath = "rabbitmq/" + image_name + "/rabbitmq_packages_rpm." + base_distro %} + {% from filepath import rabbitmq_packages %} {% elif base_package_type == 'deb' %} {% set rabbitmq_packages = [ diff --git a/docker/rabbitmq/apt_preferences_rabbitmq.debian b/docker/rabbitmq/rabbitmq/apt_preferences_rabbitmq.debian similarity index 69% rename from docker/rabbitmq/apt_preferences_rabbitmq.debian rename to docker/rabbitmq/rabbitmq/apt_preferences_rabbitmq.debian index 5c05bb96d1..a30a27c3b4 100644 --- a/docker/rabbitmq/apt_preferences_rabbitmq.debian +++ b/docker/rabbitmq/rabbitmq/apt_preferences_rabbitmq.debian @@ -2,6 +2,6 @@ Package: rabbitmq-server Pin: version 3.11.* Pin-Priority: 1000 -Package: erlang -Pin: version 25.* +Package: erlang* +Pin: version 1:25.* Pin-Priority: 1000 diff --git a/docker/rabbitmq/apt_preferences_rabbitmq.ubuntu b/docker/rabbitmq/rabbitmq/apt_preferences_rabbitmq.ubuntu similarity index 69% rename from docker/rabbitmq/apt_preferences_rabbitmq.ubuntu rename to docker/rabbitmq/rabbitmq/apt_preferences_rabbitmq.ubuntu index 5c05bb96d1..a30a27c3b4 100644 --- a/docker/rabbitmq/apt_preferences_rabbitmq.ubuntu +++ b/docker/rabbitmq/rabbitmq/apt_preferences_rabbitmq.ubuntu @@ -2,6 +2,6 @@ Package: rabbitmq-server Pin: version 3.11.* Pin-Priority: 1000 -Package: erlang -Pin: version 25.* +Package: erlang* +Pin: version 1:25.* Pin-Priority: 1000 diff --git a/docker/rabbitmq/extend_start.sh b/docker/rabbitmq/rabbitmq/extend_start.sh similarity index 100% rename from docker/rabbitmq/extend_start.sh rename to docker/rabbitmq/rabbitmq/extend_start.sh diff --git a/docker/rabbitmq/healthcheck_rabbitmq b/docker/rabbitmq/rabbitmq/healthcheck_rabbitmq similarity index 100% rename from docker/rabbitmq/healthcheck_rabbitmq rename to docker/rabbitmq/rabbitmq/healthcheck_rabbitmq diff --git a/docker/rabbitmq/rabbitmq/rabbitmq_packages_rpm.centos b/docker/rabbitmq/rabbitmq/rabbitmq_packages_rpm.centos new file mode 100644 index 0000000000..9473451aec --- /dev/null +++ b/docker/rabbitmq/rabbitmq/rabbitmq_packages_rpm.centos @@ -0,0 +1,4 @@ +{% set rabbitmq_packages = [ + 'erlang-25.*', + 'rabbitmq-server-3.11.*' +] %} \ No newline at end of file diff --git a/docker/rabbitmq/rabbitmq/rabbitmq_packages_rpm.rocky b/docker/rabbitmq/rabbitmq/rabbitmq_packages_rpm.rocky new file mode 100644 index 0000000000..9473451aec --- /dev/null +++ b/docker/rabbitmq/rabbitmq/rabbitmq_packages_rpm.rocky @@ -0,0 +1,4 @@ +{% set rabbitmq_packages = [ + 'erlang-25.*', + 'rabbitmq-server-3.11.*' +] %} \ No newline at end of file diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index acd356b55b..e90bc5bd84 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -36,11 +36,16 @@ centos-aarch64: td-agent: "treasuredata" debian: - erlang: + erlang-25: url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang-25/ubuntu" suite: "focal" component: "main" gpg_key: "erlang-ppa.gpg" + erlang-26: + url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu" + suite: "focal" + component: "main" + gpg_key: "erlang-ppa.gpg" grafana: url: "https://apt.grafana.com" suite: "stable" @@ -83,11 +88,16 @@ debian: gpg_key: "treasuredata.asc" debian-aarch64: - erlang: + erlang-25: url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang-25/ubuntu" suite: "focal" component: "main" gpg_key: "erlang-ppa.gpg" + erlang-26: + url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu" + suite: "focal" + component: "main" + gpg_key: "erlang-ppa.gpg" grafana: url: "https://apt.grafana.com" suite: "stable" @@ -167,11 +177,16 @@ rocky-aarch64: td-agent: "treasuredata" ubuntu: - erlang: + erlang-25: url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang-25/ubuntu" suite: "jammy" component: "main" gpg_key: "erlang-ppa.gpg" + erlang-26: + url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu" + suite: "jammy" + component: "main" + gpg_key: "erlang-ppa.gpg" grafana: url: "https://apt.grafana.com" suite: "stable" @@ -214,11 +229,16 @@ ubuntu: gpg_key: "treasuredata.asc" ubuntu-aarch64: - erlang: + erlang-25: url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang-25/ubuntu" suite: "jammy" component: "main" gpg_key: "erlang-ppa.gpg" + erlang-26: + url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu" + suite: "jammy" + component: "main" + gpg_key: "erlang-ppa.gpg" grafana: url: "https://apt.grafana.com" suite: "stable"