From d04d7ed47ffa30db7b5c9cc7efc82ad3e83a89e5 Mon Sep 17 00:00:00 2001 From: "Arnaud G. GIBERT" Date: Mon, 7 Oct 2024 14:18:06 +0200 Subject: [PATCH] - Now use rx3/server-mga9:1.1.3 image, - Move from http://ftp.free.fr/ mirror to http://mirror.rx3.rx3/, - Variabilization of external server ports in env & compose file, - Now use docker_tools for .env building. --- Dockerfile | 4 ++-- ReadMe.txt | 2 +- ReleaseNotes.txt | 13 ++++++++++++- compose.yaml | 8 ++++---- .env => env | 9 ++++++++- var/lib/.gitignore | 4 ++++ 6 files changed, 31 insertions(+), 9 deletions(-) rename .env => env (81%) create mode 100644 var/lib/.gitignore diff --git a/Dockerfile b/Dockerfile index 4e1a8f8..95ff451 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ ARG IMG_URL_PREFIX="rx3" -FROM ${IMG_URL_PREFIX}/server-mga9:1.1.2 +FROM ${IMG_URL_PREFIX}/server-mga9:1.1.3 ARG IMG_NAME ARG IMG_FULL_NAME @@ -36,7 +36,7 @@ user=root' RUN urpmi --force lksctp-tools \ - && rpm -Uvh http://ftp.free.fr/mirrors/mageia.org/distrib/8/x86_64/media/core/updates/erlang-erts-23.2.1-3.2.mga8.x86_64.rpm http://ftp.free.fr/mirrors/mageia.org/distrib/8/x86_64/media/core/updates/erlang-crypto-23.2.1-3.2.mga8.x86_64.rpm http://ftp.free.fr/mirrors/mageia.org/distrib/8/x86_64/media/core/updates/erlang-kernel-23.2.1-3.2.mga8.x86_64.rpm http://ftp.free.fr/mirrors/mageia.org/distrib/8/x86_64/media/core/updates/erlang-stdlib-23.2.1-3.2.mga8.x86_64.rpm http://ftp.free.fr/mirrors/mageia.org/distrib/8/x86_64/media/core/updates/erlang-syntax_tools-23.2.1-3.2.mga8.x86_64.rpm http://ftp.free.fr/mirrors/mageia.org/distrib/8/x86_64/media/core/updates/erlang-hipe-23.2.1-3.2.mga8.x86_64.rpm http://ftp.free.fr/mirrors/mageia.org/distrib/8/x86_64/media/core/updates/erlang-compiler-23.2.1-3.2.mga8.x86_64.rpm http://ftp.free.fr/mirrors/mageia.org/distrib/8/x86_64/media/core/updates/erlang-mnesia-23.2.1-3.2.mga8.x86_64.rpm http://ftp.free.fr/mirrors/mageia.org/distrib/8/x86_64/media/core/updates/erlang-runtime_tools-23.2.1-3.2.mga8.x86_64.rpm http://ftp.free.fr/mirrors/mageia.org/distrib/8/x86_64/media/core/updates/erlang-asn1-23.2.1-3.2.mga8.x86_64.rpm http://ftp.free.fr/mirrors/mageia.org/distrib/8/x86_64/media/core/updates/erlang-public_key-23.2.1-3.2.mga8.x86_64.rpm http://ftp.free.fr/mirrors/mageia.org/distrib/8/x86_64/media/core/updates/erlang-ssl-23.2.1-3.2.mga8.x86_64.rpm http://ftp.free.fr/mirrors/mageia.org/distrib/8/x86_64/media/core/updates/erlang-inets-23.2.1-3.2.mga8.x86_64.rpm http://ftp.free.fr/mirrors/mageia.org/distrib/8/x86_64/media/core/updates/erlang-tools-23.2.1-3.2.mga8.x86_64.rpm http://ftp.free.fr/mirrors/mageia.org/distrib/8/x86_64/media/core/updates/erlang-sasl-23.2.1-3.2.mga8.x86_64.rpm http://ftp.free.fr/mirrors/mageia.org/distrib/8/x86_64/media/core/updates/erlang-eldap-23.2.1-3.2.mga8.x86_64.rpm http://ftp.free.fr/mirrors/mageia.org/distrib/8/x86_64/media/core/updates/erlang-snmp-23.2.1-3.2.mga8.x86_64.rpm http://ftp.free.fr/mirrors/mageia.org/distrib/8/x86_64/media/core/updates/erlang-os_mon-23.2.1-3.2.mga8.x86_64.rpm http://ftp.free.fr/mirrors/mageia.org/distrib/8/x86_64/media/core/release/erlang-sd_notify-1.1-1.mga8.noarch.rpm http://ftp.free.fr/mirrors/mageia.org/distrib/8/x86_64/media/core/updates/erlang-xmerl-23.2.1-3.2.mga8.x86_64.rpm http://ftp.free.fr/mirrors/mageia.org/distrib/8/x86_64/media/core/updates/rabbitmq-server-3.8.18-1.mga8.x86_64.rpm http://ftp.free.fr/mirrors/mageia.org/distrib/8/x86_64/media/core/updates/lib64openssl1.1-1.1.1v-1.mga8.x86_64.rpm \ + && rpm -Uvh http://mirror.xor.rx3/mageia/distrib/8/x86_64/media/core/updates/erlang-erts-23.2.1-3.2.mga8.x86_64.rpm http://mirror.xor.rx3/mageia/distrib/8/x86_64/media/core/updates/erlang-crypto-23.2.1-3.2.mga8.x86_64.rpm http://mirror.xor.rx3/mageia/distrib/8/x86_64/media/core/updates/erlang-kernel-23.2.1-3.2.mga8.x86_64.rpm http://mirror.xor.rx3/mageia/distrib/8/x86_64/media/core/updates/erlang-stdlib-23.2.1-3.2.mga8.x86_64.rpm http://mirror.xor.rx3/mageia/distrib/8/x86_64/media/core/updates/erlang-syntax_tools-23.2.1-3.2.mga8.x86_64.rpm http://mirror.xor.rx3/mageia/distrib/8/x86_64/media/core/updates/erlang-hipe-23.2.1-3.2.mga8.x86_64.rpm http://mirror.xor.rx3/mageia/distrib/8/x86_64/media/core/updates/erlang-compiler-23.2.1-3.2.mga8.x86_64.rpm http://mirror.xor.rx3/mageia/distrib/8/x86_64/media/core/updates/erlang-mnesia-23.2.1-3.2.mga8.x86_64.rpm http://mirror.xor.rx3/mageia/distrib/8/x86_64/media/core/updates/erlang-runtime_tools-23.2.1-3.2.mga8.x86_64.rpm http://mirror.xor.rx3/mageia/distrib/8/x86_64/media/core/updates/erlang-asn1-23.2.1-3.2.mga8.x86_64.rpm http://mirror.xor.rx3/mageia/distrib/8/x86_64/media/core/updates/erlang-public_key-23.2.1-3.2.mga8.x86_64.rpm http://mirror.xor.rx3/mageia/distrib/8/x86_64/media/core/updates/erlang-ssl-23.2.1-3.2.mga8.x86_64.rpm http://mirror.xor.rx3/mageia/distrib/8/x86_64/media/core/updates/erlang-inets-23.2.1-3.2.mga8.x86_64.rpm http://mirror.xor.rx3/mageia/distrib/8/x86_64/media/core/updates/erlang-tools-23.2.1-3.2.mga8.x86_64.rpm http://mirror.xor.rx3/mageia/distrib/8/x86_64/media/core/updates/erlang-sasl-23.2.1-3.2.mga8.x86_64.rpm http://mirror.xor.rx3/mageia/distrib/8/x86_64/media/core/updates/erlang-eldap-23.2.1-3.2.mga8.x86_64.rpm http://mirror.xor.rx3/mageia/distrib/8/x86_64/media/core/updates/erlang-snmp-23.2.1-3.2.mga8.x86_64.rpm http://mirror.xor.rx3/mageia/distrib/8/x86_64/media/core/updates/erlang-os_mon-23.2.1-3.2.mga8.x86_64.rpm http://mirror.xor.rx3/mageia/distrib/8/x86_64/media/core/release/erlang-sd_notify-1.1-1.mga8.noarch.rpm http://mirror.xor.rx3/mageia/distrib/8/x86_64/media/core/updates/erlang-xmerl-23.2.1-3.2.mga8.x86_64.rpm http://mirror.xor.rx3/mageia/distrib/8/x86_64/media/core/updates/rabbitmq-server-3.8.18-1.mga8.x86_64.rpm http://mirror.xor.rx3/mageia/distrib/8/x86_64/media/core/updates/lib64openssl1.1-1.1.1v-1.mga8.x86_64.rpm \ && rabbitmq-plugins enable rabbitmq_management \ && echo -e "${RABBITMQD}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/rabbitmqd \ && chmod a+x /etc/init.d/rabbitmqd \ diff --git a/ReadMe.txt b/ReadMe.txt index 73978b9..93f132c 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -5,7 +5,7 @@ Welcome to Rx3/RabbitMQ-Mga9 docker image! This is project aims to build a RabbitMQ + Mageia 9 docker image used by others Rx3 packaging projects. Features: - - Curtently based on rx3/server-mga9:1.1.2 image, + - Curtently based on rx3/server-mga9:1.1.3 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 5aa67e8..59508a0 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,6 +1,17 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3/RabbitMQ-Mga9 V 1.0.1 - A. GIBERT - 2024/10/07 +------------------------------------------------------------------------------------------------------------------------------------ + +- Now use rx3/server-mga9:1.1.3 image, +- Move from http://ftp.free.fr/ mirror to http://mirror.rx3.rx3/, +- Variabilization of external server ports in env & compose file, +- Now use docker_tools for .env building. + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3/RabbitMQ-Mga9 V 1.0.0 - A. GIBERT - 2024/09/09 ------------------------------------------------------------------------------------------------------------------------------------ - Initial release, -- Based on server-mga9:1.1.2 image. +- Based on rx3/server-mga9:1.1.2 image. diff --git a/compose.yaml b/compose.yaml index 7c1efe1..739bb57 100644 --- a/compose.yaml +++ b/compose.yaml @@ -26,11 +26,11 @@ services: RABBITMQ_GID: ${RABBITMQ_GID} volumes: - - ./lib/rabbitmq:/var/lib/rabbitmq + - ./var/lib/rabbitmq:/var/lib/rabbitmq network_mode: bridge ports: - - "127.0.0.1:9015:9001" - - "127.0.0.1:8072:5672" - - "127.0.0.1:8073:15672" + - "127.0.0.1:${MQSERVER_SV_PORT}:9001" + - "127.0.0.1:${MQSERVER_PORT}:5672" + - "127.0.0.1:${MQSERVER_ADMIN_PORT}:15672" diff --git a/.env b/env similarity index 81% rename from .env rename to env index 0071acb..189b7e9 100644 --- a/.env +++ b/env @@ -17,7 +17,7 @@ IMG_URL_PREFIX="${IMG_REGISTRY}/${IMG_ORG}" IMG_NAME="rabbitmq-mga9" IMG_FULL_NAME="Rx3 RabbitMQ Mageia-9 Docker Image" -IMG_VERSION="1.0.0" +IMG_VERSION="1.0.1" IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}" IMG_MAINTAINER='"Arnaud G. GIBERT" ' @@ -27,5 +27,12 @@ IMG_MAINTAINER='"Arnaud G. GIBERT" ' # User Settings #------------------------------------------------------------------------------- +ENV_PORT_OFFSET=0 +SV_PORT_OFFSET=1000 + +MQSERVER_PORT=$(( 8072 + ${ENV_PORT_OFFSET})) +MQSERVER_ADMIN_PORT=$(( 8073 + ${ENV_PORT_OFFSET})) +MQSERVER_SV_PORT=$(( ${MQSERVER_PORT} + ${SV_PORT_OFFSET})) + RABBITMQ_UID=480 RABBITMQ_GID=398 diff --git a/var/lib/.gitignore b/var/lib/.gitignore new file mode 100644 index 0000000..5e7d273 --- /dev/null +++ b/var/lib/.gitignore @@ -0,0 +1,4 @@ +# Ignore everything in this directory +* +# Except this file +!.gitignore