Skip to content

Synchronise 2023.1 with upstream #332

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 19, 2024
Merged

Synchronise 2023.1 with upstream #332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
343e0bc
Build RabbitMQ 3.11, 3.12 and 3.13 in 2023.1
MoteHue May 2, 2024
18c1d8b
Merge "Build RabbitMQ 3.11, 3.12 and 3.13 in 2023.1" into stable/2023.1
Aug 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker/kolla-toolbox/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' %}
Expand Down
2 changes: 1 addition & 1 deletion docker/kolla-toolbox/apt_preferences_rabbitmq.debian
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../rabbitmq/apt_preferences_rabbitmq.debian
../rabbitmq/rabbitmq/apt_preferences_rabbitmq.debian
2 changes: 1 addition & 1 deletion docker/kolla-toolbox/apt_preferences_rabbitmq.ubuntu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../rabbitmq/apt_preferences_rabbitmq.debian
../rabbitmq/rabbitmq/apt_preferences_rabbitmq.ubuntu
1 change: 1 addition & 0 deletions docker/rabbitmq/rabbitmq-3-12/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../rabbitmq/Dockerfile.j2
7 changes: 7 additions & 0 deletions docker/rabbitmq/rabbitmq-3-12/apt_preferences_rabbitmq.debian
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Package: rabbitmq-server
Pin: version 3.12.*
Pin-Priority: 1000

Package: erlang*
Pin: version 1:26.*
Pin-Priority: 1000
7 changes: 7 additions & 0 deletions docker/rabbitmq/rabbitmq-3-12/apt_preferences_rabbitmq.ubuntu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Package: rabbitmq-server
Pin: version 3.12.*
Pin-Priority: 1000

Package: erlang*
Pin: version 1:26.*
Pin-Priority: 1000
1 change: 1 addition & 0 deletions docker/rabbitmq/rabbitmq-3-12/extend_start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../rabbitmq/extend_start.sh
1 change: 1 addition & 0 deletions docker/rabbitmq/rabbitmq-3-12/healthcheck_rabbitmq
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../rabbitmq/healthcheck_rabbitmq
4 changes: 4 additions & 0 deletions docker/rabbitmq/rabbitmq-3-12/rabbitmq_packages_rpm.centos
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{% set rabbitmq_packages = [
'erlang-26.*',
'rabbitmq-server-3.12.*'
] %}
4 changes: 4 additions & 0 deletions docker/rabbitmq/rabbitmq-3-12/rabbitmq_packages_rpm.rocky
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{% set rabbitmq_packages = [
'erlang-26.*',
'rabbitmq-server-3.12.*'
] %}
1 change: 1 addition & 0 deletions docker/rabbitmq/rabbitmq-3-13/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../rabbitmq/Dockerfile.j2
7 changes: 7 additions & 0 deletions docker/rabbitmq/rabbitmq-3-13/apt_preferences_rabbitmq.debian
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Package: rabbitmq-server
Pin: version 3.13.*
Pin-Priority: 1000

Package: erlang*
Pin: version 1:26.2.*
Pin-Priority: 1000
7 changes: 7 additions & 0 deletions docker/rabbitmq/rabbitmq-3-13/apt_preferences_rabbitmq.ubuntu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Package: rabbitmq-server
Pin: version 3.13.*
Pin-Priority: 1000

Package: erlang*
Pin: version 1:26.2.*
Pin-Priority: 1000
1 change: 1 addition & 0 deletions docker/rabbitmq/rabbitmq-3-13/extend_start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../rabbitmq/extend_start.sh
1 change: 1 addition & 0 deletions docker/rabbitmq/rabbitmq-3-13/healthcheck_rabbitmq
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../rabbitmq/healthcheck_rabbitmq
4 changes: 4 additions & 0 deletions docker/rabbitmq/rabbitmq-3-13/rabbitmq_packages_rpm.centos
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{% set rabbitmq_packages = [
'erlang-26.2.*',
'rabbitmq-server-3.13.*'
] %}
4 changes: 4 additions & 0 deletions docker/rabbitmq/rabbitmq-3-13/rabbitmq_packages_rpm.rocky
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{% set rabbitmq_packages = [
'erlang-26.2.*',
'rabbitmq-server-3.13.*'
] %}
8 changes: 3 additions & 5 deletions docker/rabbitmq/Dockerfile.j2 → docker/rabbitmq/rabbitmq/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' %}
Expand All @@ -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 = [
Expand Down
4 changes: 2 additions & 2 deletions .../rabbitmq/apt_preferences_rabbitmq.debian → .../rabbitmq/apt_preferences_rabbitmq.debian
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions .../rabbitmq/apt_preferences_rabbitmq.ubuntu → .../rabbitmq/apt_preferences_rabbitmq.ubuntu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
0 docker/rabbitmq/extend_start.sh → docker/rabbitmq/rabbitmq/extend_start.sh
View file
Open in desktop
File renamed without changes.
0 docker/rabbitmq/healthcheck_rabbitmq → ...er/rabbitmq/rabbitmq/healthcheck_rabbitmq
View file
Open in desktop
File renamed without changes.
4 changes: 4 additions & 0 deletions docker/rabbitmq/rabbitmq/rabbitmq_packages_rpm.centos
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{% set rabbitmq_packages = [
'erlang-25.*',
'rabbitmq-server-3.11.*'
] %}
4 changes: 4 additions & 0 deletions docker/rabbitmq/rabbitmq/rabbitmq_packages_rpm.rocky
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{% set rabbitmq_packages = [
'erlang-25.*',
'rabbitmq-server-3.11.*'
] %}
28 changes: 24 additions & 4 deletions kolla/template/repos.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down