From 5d33ede3f530ce1210410bd92bcd4670d5626e1b Mon Sep 17 00:00:00 2001 From: "Arnaud G. GIBERT" Date: Tue, 31 Dec 2024 20:12:23 +0100 Subject: [PATCH] - Add RedPanda Console enabling via TOOLS_RPC_ENABLE environement variable, - Use now rx3-docker/php-apache:1.5.1-mga9 image. --- Dockerfile | 21 +++++++++++++-------- ReadMe.txt | 3 ++- ReleaseNotes.txt | 11 ++++++++++- compose.yaml | 1 + env.dist | 4 +++- 5 files changed, 29 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6c9fd30..0aba8b5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -73,16 +73,21 @@ echo "?>" #------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ARG REDPANDA_CONSOLED='#!/bin/bash \n\ \n\ -sed -i "s/^ - broker-/ #- broker-/" '${REDPANDA_CONSOLE_CONFIG}' \n\ +if [[ "${TOOLS_RPC_ENABLED}" != "TRUE" ]] \n\ +then \n\ + mv /etc/supervisord.d/redpanda_consoled.ini /etc/supervisord.d/redpanda_consoled.ini.disabled \n\ +else \n\ + sed -i "s/^ - broker-/ #- broker-/" '${REDPANDA_CONSOLE_CONFIG}' \n\ \n\ -for broker in ${KAFKA_BROKERS} \n\ -do \n\ - sed -i "s/^ brokers:/ brokers:\\n - ${broker}/" '${REDPANDA_CONSOLE_CONFIG}' \n\ -done \n\ + for broker in ${KAFKA_BROKERS} \n\ + do \n\ + sed -i "s/^ brokers:/ brokers:\\n - ${broker}/" '${REDPANDA_CONSOLE_CONFIG}' \n\ + done \n\ \n\ -sed -i "s/^ #setBasePathFromXForwardedPrefix:/ setBasePathFromXForwardedPrefix:/" '${REDPANDA_CONSOLE_CONFIG}' \n\ -sed -i "s/^#server:/server:/" '${REDPANDA_CONSOLE_CONFIG}' \n\ -sed -i "s/^ #listenPort: 8080/ listenPort: '${REDPANDA_CONSOLE_PORT}'/" '${REDPANDA_CONSOLE_CONFIG}'' + sed -i "s/^ #setBasePathFromXForwardedPrefix:/ setBasePathFromXForwardedPrefix:/" '${REDPANDA_CONSOLE_CONFIG}' \n\ + sed -i "s/^#server:/server:/" '${REDPANDA_CONSOLE_CONFIG}' \n\ + sed -i "s/^ #listenPort: 8080/ listenPort: '${REDPANDA_CONSOLE_PORT}'/" '${REDPANDA_CONSOLE_CONFIG}' \n\ +fi' #------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- #------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- diff --git a/ReadMe.txt b/ReadMe.txt index 527eb55..bd7628c 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -8,7 +8,8 @@ Features: - Curtently based on rx3-docker/php-apache:1.4.0-mga9 image, - PHPPGAdmin (Mentax GitHub 2024/07 commit) installed (URL: http://localhost:xxxx/phppgadmin/), - PostgreSQL server name, host & port configurable with multi-server support, - - RedPenda Console tool (V2.7.2). + - RedPenda Console tool (V2.7.2), + - RedPenda Console service disbled by default. Enjoy it! diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 6c79eaa..6e442a3 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,12 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3-Docker/Tools V 1.2.3 - A. GIBERT - 2024/12/31 +------------------------------------------------------------------------------------------------------------------------------------ + +- Add RedPanda Console enabling via TOOLS_RPC_ENABLE environement variable, +- Use now rx3-docker/php-apache:1.5.1-mga9 image. + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3-Docker/Tools V 1.2.2 - A. GIBERT - 2024/12/16 ------------------------------------------------------------------------------------------------------------------------------------ @@ -31,7 +40,7 @@ Rx3-Docker/Tools V 1.1.0 - A. GIBERT - 2024/11/11 - Move & Rename repo from Rx3/Tools-MGA9 to Rx3-Docker/Tools, - New version naming standard, - Now use docker_tools for .env building, -- Use now rx3-docker/server:1.2.0-mga9 image, +- Use now rx3-docker/php-apache:1.4.0-mga9 image, - Add /var/log/init, /var/log/supervisor & var/log/httpd volumes. diff --git a/compose.yaml b/compose.yaml index edbd30f..bcbd63f 100644 --- a/compose.yaml +++ b/compose.yaml @@ -36,6 +36,7 @@ services: MARIADB_HOST: ${MARIADB_HOST} MARIADB_PORT: ${MARIADB_PORT} + TOOLS_RPC_ENABLED: ${TOOLS_RPC_ENABLED} KAFKA_BROKERS: ${KAFKA_HOST}:${KAFKA_PORT} healthcheck: diff --git a/env.dist b/env.dist index 986d4ec..3b24006 100644 --- a/env.dist +++ b/env.dist @@ -30,7 +30,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 TOOLS tools ${ORG_URL_PREFIX} - "Rx3-Docker/Tools" 1.2.2-mga9 ${ORG_URL_PREFIX} php-apache 1.4.0-mga9 - - 8070 80 8092 8080 apache apache +docker_service_add TOOLS tools ${ORG_URL_PREFIX} - "Rx3-Docker/Tools" 1.2.2-mga9 ${ORG_URL_PREFIX} php-apache 1.5.1-mga9 - - 8070 80 8092 8080 apache apache @@ -51,5 +51,7 @@ MARIADB_SERVER_NAME="Default" MARIADB_HOST="127.0.0.1" MARIADB_PORT="3306" +TOOLS_RPC_ENABLED="FALSE" + KAFKA_HOST="127.0.0.1" KAFKA_PORT="9092"