- Add RedPanda Console enabling via TOOLS_RPC_ENABLE environement variable,

- Use now rx3-docker/php-apache:1.5.1-mga9 image.
This commit is contained in:
Arnaud G. GIBERT 2024-12-31 20:12:23 +01:00
parent 86f481f16a
commit a0670dae75
5 changed files with 29 additions and 11 deletions

View File

@ -73,16 +73,21 @@ echo "?>"
#------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- #-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
ARG REDPANDA_CONSOLED='#!/bin/bash \n\ ARG REDPANDA_CONSOLED='#!/bin/bash \n\
\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\ \n\
for broker in ${KAFKA_BROKERS} \n\ for broker in ${KAFKA_BROKERS} \n\
do \n\ do \n\
sed -i "s/^ brokers:/ brokers:\\n - ${broker}/" '${REDPANDA_CONSOLE_CONFIG}' \n\ sed -i "s/^ brokers:/ brokers:\\n - ${broker}/" '${REDPANDA_CONSOLE_CONFIG}' \n\
done \n\ done \n\
\n\ \n\
sed -i "s/^ #setBasePathFromXForwardedPrefix:/ setBasePathFromXForwardedPrefix:/" '${REDPANDA_CONSOLE_CONFIG}' \n\ sed -i "s/^ #setBasePathFromXForwardedPrefix:/ setBasePathFromXForwardedPrefix:/" '${REDPANDA_CONSOLE_CONFIG}' \n\
sed -i "s/^#server:/server:/" '${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/^ #listenPort: 8080/ listenPort: '${REDPANDA_CONSOLE_PORT}'/" '${REDPANDA_CONSOLE_CONFIG}' \n\
fi'
#------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- #-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
#------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- #-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

View File

@ -8,7 +8,8 @@ Features:
- Curtently based on rx3-docker/php-apache:1.4.0-mga9 image, - Curtently based on rx3-docker/php-apache:1.4.0-mga9 image,
- PHPPGAdmin (Mentax GitHub 2024/07 commit) installed (URL: http://localhost:xxxx/phppgadmin/), - PHPPGAdmin (Mentax GitHub 2024/07 commit) installed (URL: http://localhost:xxxx/phppgadmin/),
- PostgreSQL server name, host & port configurable with multi-server support, - 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! Enjoy it!

View File

@ -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 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, - Move & Rename repo from Rx3/Tools-MGA9 to Rx3-Docker/Tools,
- New version naming standard, - New version naming standard,
- Now use docker_tools for .env building, - 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. - Add /var/log/init, /var/log/supervisor & var/log/httpd volumes.

View File

@ -36,6 +36,7 @@ services:
MARIADB_HOST: ${MARIADB_HOST} MARIADB_HOST: ${MARIADB_HOST}
MARIADB_PORT: ${MARIADB_PORT} MARIADB_PORT: ${MARIADB_PORT}
TOOLS_RPC_ENABLED: ${TOOLS_RPC_ENABLED}
KAFKA_BROKERS: ${KAFKA_HOST}:${KAFKA_PORT} KAFKA_BROKERS: ${KAFKA_HOST}:${KAFKA_PORT}
healthcheck: healthcheck:

View File

@ -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 | # | 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_HOST="127.0.0.1"
MARIADB_PORT="3306" MARIADB_PORT="3306"
TOOLS_RPC_ENABLED="FALSE"
KAFKA_HOST="127.0.0.1" KAFKA_HOST="127.0.0.1"
KAFKA_PORT="9092" KAFKA_PORT="9092"