diff options
| author | Zuul <zuul@review.opendev.org> | 2024-08-23 16:44:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2024-08-23 16:44:33 +0000 |
| commit | fe00de50c46cff091e71a5db987ee2a7c0b5c158 (patch) | |
| tree | cdba26a4cb78e1dd9da9404dc1be18107a0bcb29 | |
| parent | 8f6bc332bfe84275836c9153ebab6902041ca83a (diff) | |
| parent | 36a7cd053d5b13ecc9fad1866f244a733fdd58e5 (diff) | |
| download | kolla-fe00de50c46cff091e71a5db987ee2a7c0b5c158.tar.gz kolla-fe00de50c46cff091e71a5db987ee2a7c0b5c158.zip | |
Merge "Add support for checking incoming RabbitMQ version"
| -rw-r--r-- | docker/rabbitmq/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/rabbitmq/extend_start.sh | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2 index 266b99db1..7c2ee2c67 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 ef28d2b5f..a6bcf116b 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 |