diff --git a/Dockerfile b/Dockerfile index a7bf070..eeebe98 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} @@ -27,6 +28,7 @@ ARG KAFKA_LIB=/var/lib/kafka ARG KAFKA_LOG=/var/log/kafka + #----------------------------------------------------------------------------------------------------- ARG KAFKAD='#!/bin/bash \n\ \n\ @@ -44,6 +46,8 @@ fi chown -R kafka:kafka '${KAFKA_HOME}' '${KAFKA_LIB}' '${KAFKA_LOG} #----------------------------------------------------------------------------------------------------- + + #----------------------------------------------------------------------------------------------------- ARG KAFKAD_INI='[program:kafkad] \n\ directory='${KAFKA_HOME}' \n\ @@ -53,7 +57,8 @@ user=kafka' -RUN urpmi.update -a \ +RUN . /etc/profile.d/rx3.sh && isl_add ${IMG_URL} \ + && urpmi.update -a \ && urpmi --force wget \ && useradd -M --home-dir ${KAFKA_HOME} --password "" kafka \ && mkdir -p $( dirname ${KAFKA_HOME}) \ @@ -68,4 +73,6 @@ RUN urpmi.update -a && ln -s /etc/init.d/kafkad /etc/rcD.d/S30kafkad \ && echo -e "${KAFKAD_INI}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/supervisord.d/kafkad.ini + + EXPOSE ${KAFKA_PORT} diff --git a/ReadMe.txt b/ReadMe.txt index 3db389f..5606650 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -5,7 +5,7 @@ Welcome to Rx3-Docker/Kafka docker image! This project aims to build a Kafka docker image used by other Rx3 packaging projects. Features: - - Curtently based on rx3-docker/java:1.1.4-mga9 image, + - Curtently based on rx3-docker/java:1.1.5-mga9 image, - Kafka 3.9.1 and Scala 2.13. diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 0507eb3..ee80e85 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,13 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3-Docker/Kafka V 1.0.6 - A. GIBERT - 2026/02/16 +------------------------------------------------------------------------------------------------------------------------------------ + +- Add ISL support, +- Use now rx3-docker/java:1.1.5-mga9 image, +- Rebuild for updates. + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3-Docker/Kafka V 1.0.5 - A. GIBERT - 2025/09/29 ------------------------------------------------------------------------------------------------------------------------------------ diff --git a/compose.yaml b/compose.yaml index d2380de..22ffcf8 100644 --- a/compose.yaml +++ b/compose.yaml @@ -19,6 +19,7 @@ services: IMG_NAME_FULL: ${TS_IMG_NAME_FULL} IMG_VERSION: ${TS_IMG_VERSION} IMG_MAINTAINER: ${TS_IMG_MAINTAINER} + IMG_URL: ${TS_IMG_URL} IMG_FROM_URL: ${TS_IMG_FROM_URL} KAFKA_PORT: ${TS_PORT_MAIN_INT} diff --git a/env.dist b/env.dist index f05e591..146017b 100644 --- a/env.dist +++ b/env.dist @@ -31,7 +31,7 @@ PORT_SV_OFFSET=1000 # | 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 TS topic-server ${ORG_URL_PREFIX} kafka "Rx3-Docker/Kafka" 1.0.5-mga9 ${ORG_URL_PREFIX} java 1.1.4-mga9 - - 9092 9092 - - apache apache +docker_service_add TS topic-server ${ORG_URL_PREFIX} kafka "Rx3-Docker/Kafka" 1.0.6-mga9 ${ORG_URL_PREFIX} java 1.1.5-mga9 - - 9092 9092 - - apache apache