- Use now rx3-docker/server:1.2.1-mga9 image,

- Add Dockerfile MIRROR_URL variable.
This commit is contained in:
Arnaud G. GIBERT 2025-03-08 19:18:25 +01:00
parent ef8a780452
commit 170fe36742
5 changed files with 30 additions and 14 deletions

View File

@ -16,16 +16,19 @@ LABEL org.rx3.${IMG_NAME}.maintainer=${IMG_MAINTAINER}
LABEL maintainer=${IMG_MAINTAINER}
ARG RABBITMQ_LIB
ARG RABBITMQ_LOG
ARG RABBITMQ_PORT_MAIN
ARG RABBITMQ_PORT_ADMIN
ARG POSTRMQ_LOG_DIR
ARG POSTRMQ_LOG_FILE="${POSTRMQ_LOG_DIR}/postrmq.log"
ARG RABBITMQ_LIB=/var/lib/rabbitmq
ARG RABBITMQ_PORT=5672
ARG RABBITMQ_ADMIN_PORT=15672
ARG MIRROR_URL="http://mirror.xor.rx3/mageia"
#ARG MIRROR_URL="https://mirror.rx3.net/mageia"
#-------------------------------------------------------------------------------------------------------------------
@ -34,7 +37,7 @@ ARG RABBITMQD='#!/bin/bash
usermod -u ${RABBITMQ_UID} -s /bin/bash rabbitmq \n\
groupmod -g ${RABBITMQ_GID} rabbitmq \n\
\n\
chown -R rabbitmq:rabbitmq '${RABBITMQ_LIB}' /var/log/rabbitmq /var/run/rabbitmq'
chown -R rabbitmq:rabbitmq '${RABBITMQ_LIB}' '${RABBITMQ_LOG}' /var/run/rabbitmq'
#-------------------------------------------------------------------------------------------------------------------
#-------------------------------------------------------------------------------------------------------------------
@ -80,8 +83,8 @@ command=/usr/local/sbin/postrmq'
RUN urpmi --force lksctp-tools \
&& 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 \
RUN 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 \
&& echo -e "${RABBITMQD}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/rabbitmqd \
&& chmod a+x /etc/init.d/rabbitmqd \
@ -94,6 +97,7 @@ RUN urpmi --force lksctp-tools \
VOLUME ${RABBITMQ_LIB}
VOLUME ${RABBITMQ_LOG}
EXPOSE ${RABBITMQ_PORT_MAIN}
EXPOSE ${RABBITMQ_PORT_ADMIN}

View File

@ -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.2.0-mga9 image,
- Curtently based on rx3-docker/server:1.2.1-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,

View File

@ -1,3 +1,12 @@
------------------------------------------------------------------------------------------------------------------------------------
Rx3-Docker/RabbitMQ V 1.1.1 - A. GIBERT - 2025/03/08
------------------------------------------------------------------------------------------------------------------------------------
- Use now rx3-docker/server:1.2.1-mga9 image,
- Add Dockerfile MIRROR_URL variable.
------------------------------------------------------------------------------------------------------------------------------------
Rx3-Docker/RabbitMQ V 1.1.0 - A. GIBERT - 2024/11/12
------------------------------------------------------------------------------------------------------------------------------------

View File

@ -21,6 +21,7 @@ services:
IMG_FROM_URL: ${IMG_FROM_URL}
RABBITMQ_LIB: ${MQSERVER_LIB_DIR}
RABBITMQ_LOG: ${MQSERVER_LOG_RABBITMQ_DIR}
RABBITMQ_PORT_MAIN: ${MQSERVER_PORT_MAIN_INT}
RABBITMQ_PORT_ADMIN: ${MQSERVER_PORT_ADMIN_INT}
POSTRMQ_LOG_DIR: ${MQSERVER_LOG_POSTRMQ_DIR}
@ -32,17 +33,18 @@ services:
RABBITMQ_GID: ${RABBITMQ_GID}
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:${MQSERVER_PORT_ADMIN_INT}"]
interval: 30s
timeout: 10s
start_period: 60s
start_interval: 10s
retries: 30
test: ["CMD", "curl", "-f", "http://localhost:${MQSERVER_PORT_ADMIN_INT}"]
interval: 30s
timeout: 10s
start_period: 60s
start_interval: 10s
retries: 30
volumes:
- ./var/lib/rabbitmq:${MQSERVER_LIB_DIR}
- ./var/log/init:${MQSERVER_LOG_INIT_DIR}
- ./var/log/supervisor:${MQSERVER_LOG_SV_DIR}
- ./var/log/rabbitmq:${MQSERVER_LOG_RABBITMQ_DIR}
ports:
- "127.0.0.1:${MQSERVER_PORT_SV_EXT}:${MQSERVER_PORT_SV_INT}"

View File

@ -18,13 +18,13 @@ ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}"
IMG_NAME="rabbitmq"
IMG_NAME_FULL="Rx3-Docker/PostgreSQL Docker Image"
IMG_VERSION="1.1.0-mga9"
IMG_VERSION="1.1.1-mga9"
IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
IMG_URL_PREFIX="${ORG_URL_PREFIX}"
IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}"
IMG_FROM_URL="${ORG_URL_PREFIX}/server:1.2.0-mga9"
IMG_FROM_URL="${ORG_URL_PREFIX}/server:1.2.1-mga9"
@ -44,9 +44,10 @@ MQSERVER_PORT_ADMIN_INT=15672
MQSERVER_PORT_SV_EXT=$(( ${MQSERVER_PORT_MAIN_EXT} + ${SV_PORT_OFFSET}))
MQSERVER_PORT_SV_INT=9001
MQSERVER_LIB_DIR="/var/lib/pgsql"
MQSERVER_LIB_DIR="/var/lib/rabbitmq"
MQSERVER_LOG_INIT_DIR="/var/log/init"
MQSERVER_LOG_SV_DIR="/var/log/supervisor"
MQSERVER_LOG_RABBITMQ_DIR="/var/log/rabbitmq"
MQSERVER_LOG_POSTRMQ_DIR="${MQSERVER_LOG_SV_DIR}"
RABBITMQ_UID=480