Compare commits
4 Commits
tools-1.2.
...
tools-1.2.
| Author | SHA1 | Date | |
|---|---|---|---|
| 33f30c4917 | |||
| 1061dac18e | |||
| a2dcf6b8dd | |||
| a49fa5e7ff |
40
Dockerfile
40
Dockerfile
@@ -19,11 +19,8 @@ ARG APACHE_DOC_ROOT
|
||||
ARG REDPANDA_CONSOLE_PORT
|
||||
|
||||
|
||||
ARG PHPPGADMIN_OWNER="mentax"
|
||||
ARG PHPPGADMIN_COMMIT="d0d35701af8644788f84b808d21e7fd04213baa0"
|
||||
|
||||
ARG PHPPGADMIN_HOME="${APACHE_DOC_ROOT}/phppgadmin"
|
||||
ARG PHPPGADMIN_CONFIG="${PHPPGADMIN_HOME}/conf/config.inc.php"
|
||||
ARG PHPPGADMIN_HTTPD_CONFIG="/etc/httpd/conf/sites.d/default_vhost.d/60-phppgadmin.conf"
|
||||
ARG PHPPGADMIN_CONFIG="/etc/phppgadmin/config.inc.php"
|
||||
|
||||
ARG REDPANDA_CONSOLE_HOME="/opt/appl/redpanda_console"
|
||||
ARG REDPANDA_CONSOLE_CONFIG="${REDPANDA_CONSOLE_HOME}/etc/redpanda-console-config.yaml"
|
||||
@@ -33,11 +30,13 @@ ARG REDPANDA_CONSOLE_CONFIG="${REDPANDA_CONSOLE_HOME}/etc/redpanda-console-confi
|
||||
#-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
ARG TOOLSD='#!/bin/bash \n\
|
||||
\n\
|
||||
cp '${PHPPGADMIN_CONFIG}'.ref '${PHPPGADMIN_CONFIG}' \n\
|
||||
chown apache:root '${PHPPGADMIN_CONFIG}' \n\
|
||||
\n\
|
||||
sed -i "s/\t\$conf\[`servers`\]/\t\/\/\ $conf\[`servers`\]/" '${PHPPGADMIN_CONFIG}' \n\
|
||||
sed -i "s/\$conf\[`extra_login_security`\] = true;/\$conf\[`extra_login_security`\] = false;/" '${PHPPGADMIN_CONFIG}' \n\
|
||||
sed -i "s/?>//" '${PHPPGADMIN_CONFIG}' \n\
|
||||
\n\
|
||||
\n\
|
||||
for vars in POSTGRESQL_SERVER_NAME:desc POSTGRESQL_HOST:host POSTGRESQL_PORT:port \n\
|
||||
do \n\
|
||||
IFS=":" \n\
|
||||
@@ -70,10 +69,11 @@ echo "?>"
|
||||
#-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
ARG REDPANDA_CONSOLED='#!/bin/bash \n\
|
||||
\n\
|
||||
if [[ "${TOOLS_RPC_ENABLED}" != "TRUE" ]] \n\
|
||||
cp '${REDPANDA_CONSOLE_CONFIG}'.ref '${REDPANDA_CONSOLE_CONFIG}' \n\
|
||||
chown apache:root '${REDPANDA_CONSOLE_CONFIG}' \n\
|
||||
\n\
|
||||
if [[ "${KAFKA_BROKERS}" != "" ]] \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\
|
||||
@@ -84,30 +84,36 @@ else
|
||||
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 \n\
|
||||
\n\
|
||||
# RedPanda Console is disabled by default \n\
|
||||
if [[ "${TOOLS_RPC_ENABLED}" != "TRUE" ]] \n\
|
||||
then \n\
|
||||
file_enable /etc/supervisord.d/redpanda_consoled.ini FALSE \n\
|
||||
fi'
|
||||
#-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
#-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
ARG REDPANDA_CONSOLED_INI='[program:redpanda_consoled] \n\
|
||||
directory='${REDPANDA_CONSOLE_HOME}' \n\
|
||||
command='${REDPANDA_CONSOLE_HOME}'/bin/redpanda-console -config.filepath '${REDPANDA_CONSOLE_CONFIG}''
|
||||
command='${REDPANDA_CONSOLE_HOME}'/bin/redpanda-console -config.filepath '${REDPANDA_CONSOLE_CONFIG}' \n\
|
||||
user=apache'
|
||||
#-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
|
||||
|
||||
RUN urpmi.update -a \
|
||||
&& urpmi --force wget postgresql15 \
|
||||
&& mkdir -p /var/www/appl \
|
||||
&& wget -q -O- "https://github.com/${PHPPGADMIN_OWNER}/phppgadmin/archive/${PHPPGADMIN_COMMIT}.tar.gz" | tar xzf - -C ${APACHE_DOC_ROOT} \
|
||||
&& mv ${APACHE_DOC_ROOT}/phppgadmin-${PHPPGADMIN_COMMIT} ${APACHE_DOC_ROOT}/phppgadmin \
|
||||
&& sed -i 's/$_SERVER\['\''REQUEST_URI'\''\]/preg_replace(\"\/^\\\/phppgadmin\\\/\/", "", $_SERVER['\''REQUEST_URI'\''])/g' ${APACHE_DOC_ROOT}/phppgadmin/display.php \
|
||||
&& cp ${APACHE_DOC_ROOT}/phppgadmin/conf/config.inc.php-dist ${APACHE_DOC_ROOT}/phppgadmin/conf/config.inc.php \
|
||||
&& urpmi --force wget postgresql15 phppgadmin \
|
||||
&& mv /etc/httpd/conf/sites.d/phppgadmin.conf ${PHPPGADMIN_HTTPD_CONFIG} \
|
||||
&& sed -i -e '/<Directory .*/,/<\/Directory>/d' ${PHPPGADMIN_HTTPD_CONFIG} \
|
||||
&& echo -e "<Directory /var/www/phppgadmin>\n AllowOverride All\n Require all granted\n</Directory>" ${PHPPGADMIN_HTTPD_CONFIG} \
|
||||
&& mv ${PHPPGADMIN_CONFIG} ${PHPPGADMIN_CONFIG}.ref \
|
||||
&& echo -e "${TOOLSD}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/toolsd \
|
||||
&& chmod a+x /etc/init.d/toolsd \
|
||||
&& ln -s /etc/init.d/toolsd /etc/rcD.d/S40toolsd \
|
||||
&& mkdir -p ${REDPANDA_CONSOLE_HOME}/bin ${REDPANDA_CONSOLE_HOME}/etc \
|
||||
&& wget -q -O- "https://github.com/redpanda-data/console/releases/download/v2.7.2/redpanda_console_2.7.2_linux_amd64.tar.gz" | tar xzf - -C ${REDPANDA_CONSOLE_HOME}/bin \
|
||||
&& wget -q -O- "https://docs.redpanda.com/current/shared/_attachments/redpanda-console-config.yaml" > ${REDPANDA_CONSOLE_CONFIG} \
|
||||
&& wget -q -O- "https://docs.redpanda.com/24.2/shared/_attachments/redpanda-console-config.yaml" > ${REDPANDA_CONSOLE_CONFIG}.ref \
|
||||
&& echo -e "${REDPANDA_CONSOLED}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/redpanda_consoled \
|
||||
&& chmod a+x /etc/init.d/redpanda_consoled \
|
||||
&& ln -s /etc/init.d/redpanda_consoled /etc/rcD.d/S45redpanda_consoled \
|
||||
|
||||
@@ -5,10 +5,10 @@ Welcome to Rx3-Docker/Tools docker image!
|
||||
This project aims to build a docker image embeding some usefull tools to tests other images from Rx3 packaging projects.
|
||||
|
||||
Features:
|
||||
- Curtently based on rx3-docker/php-apache:1.5.3-mga9 image,
|
||||
- PHPPGAdmin (Mentax GitHub 2024/07 commit) installed (URL: http://localhost:xxxx/phppgadmin/),
|
||||
- Curtently based on rx3-docker/php-apache:1.6.0-mga9 image,
|
||||
- PHPPGAdmin (Mentax GitHub 2025/05/09 10926c9 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 (V 2.7.2),
|
||||
- RedPenda Console service disbled by default (TOOLS_RPC_ENABLED variable).
|
||||
|
||||
|
||||
|
||||
@@ -1,3 +1,25 @@
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
Rx3-Docker/Tools V 1.2.7 - A. GIBERT - 2025/12/02
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
- Use now the rx3 phpgadmin rpm,
|
||||
- Fix phppgadmin config user name,
|
||||
- Run RedPanda Console under apache user and not root,
|
||||
- Use now rx3-docker/php-apache:1.6.0-mga9 image,
|
||||
- Rebuild for updates.
|
||||
|
||||
|
||||
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
Rx3-Docker/Tools V 1.2.6 - A. GIBERT - 2025/09/19
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
- Use now rx3-docker/php-apache:1.5.4-mga9 image,
|
||||
- Rebuild for updates,
|
||||
- Fix RedPanda Console config file download.
|
||||
|
||||
|
||||
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
Rx3-Docker/Tools V 1.2.5 - A. GIBERT - 2025/04/21
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
2
env.dist
2
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.5-mga9 ${ORG_URL_PREFIX} php-apache 1.5.3-mga9 - - 8070 80 8092 8080 apache apache
|
||||
docker_service_add TOOLS tools ${ORG_URL_PREFIX} - "Rx3-Docker/Tools" 1.2.7-mga9 ${ORG_URL_PREFIX} php-apache 1.6.0-mga9 - - 8070 80 8092 8080 apache apache
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user