From a9e5fad5ed829d5d7086b26d93cbaeb71f39aaec Mon Sep 17 00:00:00 2001 From: "Arnaud G. GIBERT" Date: Sun, 15 Feb 2026 00:45:10 +0100 Subject: [PATCH] - Add ISL support, - Use now rx3-docker/server:1.3.0-mga9 image, - Rebuild for updates. --- Dockerfile | 12 +++++++++++- ReadMe.txt | 3 ++- ReleaseNotes.txt | 10 ++++++++++ compose.yaml | 1 + env.dist | 2 +- 5 files changed, 25 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 881adf2..c923ecd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,6 +9,7 @@ ARG IMG_NAME ARG IMG_NAME_FULL ARG IMG_VERSION ARG IMG_MAINTAINER +ARG IMG_URL LABEL org.rx3.${IMG_NAME}.name=${IMG_NAME_FULL} LABEL org.rx3.${IMG_NAME}.version=${IMG_VERSION} @@ -40,12 +41,16 @@ groupmod -g ${RABBITMQ_GID} rabbitmq chown -R rabbitmq:rabbitmq '${RABBITMQ_LIB}' '${RABBITMQ_LOG}' /var/run/rabbitmq' #------------------------------------------------------------------------------------------------------------------- + + #------------------------------------------------------------------------------------------------------------------- ARG RABBITMQD_INI='[program:rabbitmqd] \n\ command=su - rabbitmq -c /usr/lib/rabbitmq/bin/rabbitmq-server \n\ user=root' #------------------------------------------------------------------------------------------------------------------- + + #------------------------------------------------------------------------------------------------------------------- ARG POSTRMQ='#!/bin/bash \n\ \n\ @@ -76,6 +81,8 @@ fi log "Completed"' #------------------------------------------------------------------------------------------------------------------- + + #------------------------------------------------------------------------------------------------------------------- ARG POSTRMQ_INI='[program:postrmq] \n\ command=/usr/local/sbin/postrmq' @@ -83,7 +90,8 @@ command=/usr/local/sbin/postrmq' -RUN urpmi.update -a \ +RUN . /etc/profile.d/rx3.sh && isl_add ${IMG_URL} \ + && urpmi.update -a \ && urpmi --force lksctp-tools \ && rpm -Uvh ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-erts-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-crypto-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-kernel-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-stdlib-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-syntax_tools-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-hipe-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-compiler-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-mnesia-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-runtime_tools-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-asn1-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-public_key-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-ssl-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-inets-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-tools-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-sasl-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-eldap-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-snmp-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-os_mon-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/release/erlang-sd_notify-1.1-1.mga8.noarch.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/erlang-xmerl-23.2.1-3.2.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/rabbitmq-server-3.8.18-1.mga8.x86_64.rpm ${MIRROR_URL}/distrib/8/x86_64/media/core/updates/lib64openssl1.1-1.1.1v-1.mga8.x86_64.rpm \ && rabbitmq-plugins enable rabbitmq_management \ @@ -100,5 +108,7 @@ RUN urpmi.update -a VOLUME ${RABBITMQ_LIB} VOLUME ${RABBITMQ_LOG} + + EXPOSE ${RABBITMQ_PORT_MAIN} EXPOSE ${RABBITMQ_PORT_ADMIN} diff --git a/ReadMe.txt b/ReadMe.txt index e104d63..962df7b 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -5,13 +5,14 @@ Welcome to Rx3-Docker/RabbitMQ docker image! This project aims to build a RabbitMQ docker image used by others Rx3 packaging projects. Features: - - Curtently based on rx3-docker/server:1.2.7-mga9 image, + - Curtently based on rx3-docker/server:1.3.0-mga9 image, - Fallback on RabbitMQ 3.8.18 from Mageia 8 next to broken Mageia 9 version! - Following env vars supported: - RABBITMQ_UID & RABBITMQ_GID, - Management plugin enabled. + Enjoy it! Your Rx3 Team. diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 0554bc8..0863df4 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,13 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3-Docker/RabbitMQ V 1.1.5 - A. GIBERT - 2026/02/16 +------------------------------------------------------------------------------------------------------------------------------------ + +- Add ISL support, +- Use now rx3-docker/server:1.3.0-mga9 image, +- Rebuild for updates. + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3-Docker/RabbitMQ V 1.1.4 - A. GIBERT - 2025/11/29 ------------------------------------------------------------------------------------------------------------------------------------ diff --git a/compose.yaml b/compose.yaml index 31dcbef..1f5f325 100644 --- a/compose.yaml +++ b/compose.yaml @@ -18,6 +18,7 @@ services: IMG_NAME_FULL: ${MQS_IMG_NAME_FULL} IMG_VERSION: ${MQS_IMG_VERSION} IMG_MAINTAINER: ${MQS_IMG_MAINTAINER} + IMG_URL: ${MQS_IMG_URL} IMG_FROM_URL: ${MQS_IMG_FROM_URL} RABBITMQ_LIB: ${MQS_LIB_INT} diff --git a/env.dist b/env.dist index 199fb35..c34b858 100644 --- a/env.dist +++ b/env.dist @@ -41,7 +41,7 @@ DOCKER_TOOLS_VOLUME=SINGLE # | Prefix | Name | URL Prefix | Name | Name Full | Version | URL Prefix | Name | Version | Name | Version | Ext | Int | Ext | Int | Name / Id | Name / Id | #------------------+----------+--------------------------+--------------------+------------------+------------------------------------+----------------------+--------------------+---------------+------------+--------------+------------+-------+-------+-------+-------+--------------+--------------+ -docker_service_add MQS mqserver ${ORG_URL_PREFIX} rabbitmq "Rx3-Docker/RabbitMQ Docker Image" 1.1.4-mga9 ${ORG_URL_PREFIX} server 1.2.7-mga9 - - 8072 5672 8073 15672 480 398 +docker_service_add MQS mqserver ${ORG_URL_PREFIX} rabbitmq "Rx3-Docker/RabbitMQ Docker Image" 1.1.5-mga9 ${ORG_URL_PREFIX} server 1.3.0-mga9 - - 8072 5672 8073 15672 480 398