diff --git a/Dockerfile b/Dockerfile index c923ecd..26e6b0e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -90,7 +90,7 @@ command=/usr/local/sbin/postrmq' -RUN . /etc/profile.d/rx3.sh && isl_add ${IMG_URL} \ +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 \ diff --git a/ReadMe.txt b/ReadMe.txt index 962df7b..e8615c0 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -5,7 +5,7 @@ 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.3.0-mga9 image, + - Curtently based on rx3-docker/server:1.4.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, diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 0863df4..d207698 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,9 +1,19 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3-Docker/RabbitMQ V 1.2.0 - A. GIBERT - 2026/05/30 +------------------------------------------------------------------------------------------------------------------------------------ + +- Now use rx3-docker/server:1.4.0-mga9 image, +- Now use docker-tools-1.5.2, +- Rebuild for updates. + + + ------------------------------------------------------------------------------------------------------------------------------------ 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, +- Now use rx3-docker/server:1.3.0-mga9 image, - Rebuild for updates. @@ -12,7 +22,7 @@ Rx3-Docker/RabbitMQ V 1.1.5 - A. GIBERT - 2026/02/16 Rx3-Docker/RabbitMQ V 1.1.4 - A. GIBERT - 2025/11/29 ------------------------------------------------------------------------------------------------------------------------------------ -- Use now rx3-docker/server:1.2.7-mga9 image, +- Now use rx3-docker/server:1.2.7-mga9 image, - Rebuild for updates. @@ -21,7 +31,7 @@ Rx3-Docker/RabbitMQ V 1.1.4 - A. GIBERT - 2025/11/29 Rx3-Docker/RabbitMQ V 1.1.3 - A. GIBERT - 2025/09/19 ------------------------------------------------------------------------------------------------------------------------------------ -- Use now rx3-docker/server:1.2.6-mga9 image, +- Now use rx3-docker/server:1.2.6-mga9 image, - Rebuild for updates. @@ -30,7 +40,7 @@ Rx3-Docker/RabbitMQ V 1.1.3 - A. GIBERT - 2025/09/19 Rx3-Docker/RabbitMQ V 1.1.2 - A. GIBERT - 2025/04/21 ------------------------------------------------------------------------------------------------------------------------------------ -- Use now rx3-docker/server:1.2.2-mga9 image, +- Now use rx3-docker/server:1.2.2-mga9 image, - Clean-up env.dist. @@ -39,7 +49,7 @@ Rx3-Docker/RabbitMQ V 1.1.2 - A. GIBERT - 2025/04/21 Rx3-Docker/RabbitMQ V 1.1.1 - A. GIBERT - 2025/03/08 ------------------------------------------------------------------------------------------------------------------------------------ -- Use now rx3-docker/server:1.2.1-mga9 image, +- Now use rx3-docker/server:1.2.1-mga9 image, - Add Dockerfile MIRROR_URL variable. @@ -51,7 +61,7 @@ Rx3-Docker/RabbitMQ V 1.1.0 - A. GIBERT - 2024/11/12 - Move & Rename repo from Rx3/RabbitMQ-MGA9 to Rx3-Docker/RabbitMQ, - New version naming standard, - Now use docker_tools for .env building, -- Use now rx3-docker/server:1.2.0-mga9 image, +- Now use rx3-docker/server:1.2.0-mga9 image, - Add /var/log/init & /var/log/supervisor volumes, - Add healthcheck example in compose file. diff --git a/env.dist b/env.dist index c34b858..e0daf48 100644 --- a/env.dist +++ b/env.dist @@ -17,6 +17,7 @@ ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}" # Image Settings #------------------------------------------------------------------------------- +APPL_NAME="" HOST_NAME_PREFIX="" PORT_ENV_OFFSET=0 @@ -25,7 +26,7 @@ PORT_SV_INT=9001 PORT_SV_OFFSET=1000 NETWORK_NAME=${HOST_NAME_PREFIX} -NETWORK_IF_NAME=br-${APPL_NAME_SHORT}-${APPL_ENV} +#NETWORK_IF_NAME=br-${APPL_NAME_SHORT}-${APPL_ENV} DOCKER_TOOLS_DEBUG=FALSE @@ -41,7 +42,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.5-mga9 ${ORG_URL_PREFIX} server 1.3.0-mga9 - - 8072 5672 8073 15672 480 398 +docker_service_add MQS mqserver ${ORG_URL_PREFIX} rabbitmq "Rx3-Docker/RabbitMQ Docker Image" 1.2.0-mga9 ${ORG_URL_PREFIX} server 1.4.0-mga9 - - 8072 5672 8073 15672 480 398