From 36a7cd053d5b13ecc9fad1866f244a733fdd58e5 Mon Sep 17 00:00:00 2001 From: Matt Crees Date: Mon, 12 Aug 2024 16:08:43 +0100 Subject: [PATCH] Add support for checking incoming RabbitMQ version Will be used to check if the current RabbitMQ version is high enough before upgrading to the new one. Change-Id: Ie133d6efc2e4c00002b8f0724e0183eaab35d1c5 --- docker/rabbitmq/Dockerfile.j2 | 2 +- docker/rabbitmq/extend_start.sh | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2 index 266b99db15..7c2ee2c67a 100644 --- a/docker/rabbitmq/Dockerfile.j2 +++ b/docker/rabbitmq/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" version_check=true {% endblock %} {% block rabbitmq_header %}{% endblock %} diff --git a/docker/rabbitmq/extend_start.sh b/docker/rabbitmq/extend_start.sh index ef28d2b5fb..a6bcf116bb 100644 --- a/docker/rabbitmq/extend_start.sh +++ b/docker/rabbitmq/extend_start.sh @@ -24,3 +24,8 @@ fi if [[ $(stat -c %a ${RABBITMQ_LOG_DIR}) != "755" ]]; then chmod 755 ${RABBITMQ_LOG_DIR} fi + +if [[ "${!KOLLA_RABBITMQ_VERSION_CHECK[@]}" ]]; then + rabbitmqctl --version + exit 0 +fi