Compare commits
7 Commits
tools-1.2.
...
tools-1.2.
| Author | SHA1 | Date | |
|---|---|---|---|
| 30f39da74e | |||
| 33f30c4917 | |||
| 1061dac18e | |||
| a2dcf6b8dd | |||
| a49fa5e7ff | |||
| 9426e53e31 | |||
| e0e13956fd |
52
Dockerfile
52
Dockerfile
@@ -9,6 +9,7 @@ ARG IMG_NAME
|
|||||||
ARG IMG_NAME_FULL
|
ARG IMG_NAME_FULL
|
||||||
ARG IMG_VERSION
|
ARG IMG_VERSION
|
||||||
ARG IMG_MAINTAINER
|
ARG IMG_MAINTAINER
|
||||||
|
ARG IMG_URL
|
||||||
|
|
||||||
LABEL org.rx3.${IMG_NAME}.name=${IMG_NAME_FULL}
|
LABEL org.rx3.${IMG_NAME}.name=${IMG_NAME_FULL}
|
||||||
LABEL org.rx3.${IMG_NAME}.version=${IMG_VERSION}
|
LABEL org.rx3.${IMG_NAME}.version=${IMG_VERSION}
|
||||||
@@ -19,11 +20,8 @@ ARG APACHE_DOC_ROOT
|
|||||||
ARG REDPANDA_CONSOLE_PORT
|
ARG REDPANDA_CONSOLE_PORT
|
||||||
|
|
||||||
|
|
||||||
ARG PHPPGADMIN_OWNER="mentax"
|
ARG PHPPGADMIN_HTTPD_CONFIG="/etc/httpd/conf/sites.d/default_vhost.d/60-phppgadmin.conf"
|
||||||
ARG PHPPGADMIN_COMMIT="d0d35701af8644788f84b808d21e7fd04213baa0"
|
ARG PHPPGADMIN_CONFIG="/etc/phppgadmin/config.inc.php"
|
||||||
|
|
||||||
ARG PHPPGADMIN_HOME="${APACHE_DOC_ROOT}/phppgadmin"
|
|
||||||
ARG PHPPGADMIN_CONFIG="${PHPPGADMIN_HOME}/conf/config.inc.php"
|
|
||||||
|
|
||||||
ARG REDPANDA_CONSOLE_HOME="/opt/appl/redpanda_console"
|
ARG REDPANDA_CONSOLE_HOME="/opt/appl/redpanda_console"
|
||||||
ARG REDPANDA_CONSOLE_CONFIG="${REDPANDA_CONSOLE_HOME}/etc/redpanda-console-config.yaml"
|
ARG REDPANDA_CONSOLE_CONFIG="${REDPANDA_CONSOLE_HOME}/etc/redpanda-console-config.yaml"
|
||||||
@@ -33,11 +31,13 @@ ARG REDPANDA_CONSOLE_CONFIG="${REDPANDA_CONSOLE_HOME}/etc/redpanda-console-confi
|
|||||||
#-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||||
ARG TOOLSD='#!/bin/bash \n\
|
ARG TOOLSD='#!/bin/bash \n\
|
||||||
\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/\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/\$conf\[`extra_login_security`\] = true;/\$conf\[`extra_login_security`\] = false;/" '${PHPPGADMIN_CONFIG}' \n\
|
||||||
sed -i "s/?>//" '${PHPPGADMIN_CONFIG}' \n\
|
sed -i "s/?>//" '${PHPPGADMIN_CONFIG}' \n\
|
||||||
\n\
|
\n\
|
||||||
\n\
|
|
||||||
for vars in POSTGRESQL_SERVER_NAME:desc POSTGRESQL_HOST:host POSTGRESQL_PORT:port \n\
|
for vars in POSTGRESQL_SERVER_NAME:desc POSTGRESQL_HOST:host POSTGRESQL_PORT:port \n\
|
||||||
do \n\
|
do \n\
|
||||||
IFS=":" \n\
|
IFS=":" \n\
|
||||||
@@ -66,17 +66,17 @@ done
|
|||||||
\n\
|
\n\
|
||||||
echo "?>" >> '${PHPPGADMIN_CONFIG}''
|
echo "?>" >> '${PHPPGADMIN_CONFIG}''
|
||||||
#-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||||
#sed -i "s/\$conf\[`servers`\]\[0\]\[`desc`\]/\/\/\$conf\[`servers`\]\[0\]\[`desc`\]/" '${PHPPGADMIN_CONFIG}' \n\
|
|
||||||
#sed -i "s/\$conf\[`servers`\]\[0\]\[`host`\]/\/\/\$conf\[`servers`\]\[0\]\[`host`\]/" '${PHPPGADMIN_CONFIG}' \n\
|
|
||||||
#sed -i "s/\$conf\[`servers`\]\[0\]\[`port`\]/\/\/\$conf\[`servers`\]\[0\]\[`port`\]/" '${PHPPGADMIN_CONFIG}' \n\
|
|
||||||
|
|
||||||
#-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||||
ARG REDPANDA_CONSOLED='#!/bin/bash \n\
|
ARG REDPANDA_CONSOLED='#!/bin/bash \n\
|
||||||
\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\
|
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\
|
sed -i "s/^ - broker-/ #- broker-/" '${REDPANDA_CONSOLE_CONFIG}' \n\
|
||||||
\n\
|
\n\
|
||||||
for broker in ${KAFKA_BROKERS} \n\
|
for broker in ${KAFKA_BROKERS} \n\
|
||||||
@@ -87,30 +87,40 @@ else
|
|||||||
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}' \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'
|
fi'
|
||||||
#-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||||
ARG REDPANDA_CONSOLED_INI='[program:redpanda_consoled] \n\
|
ARG REDPANDA_CONSOLED_INI='[program:redpanda_consoled] \n\
|
||||||
directory='${REDPANDA_CONSOLE_HOME}' \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 --force wget postgresql15 \
|
RUN . /etc/profile.d/rx3.sh && isl_add ${IMG_URL} \
|
||||||
&& mkdir -p /var/www/appl \
|
&& urpmi.update -a \
|
||||||
&& wget -q -O- "https://github.com/${PHPPGADMIN_OWNER}/phppgadmin/archive/${PHPPGADMIN_COMMIT}.tar.gz" | tar xzf - -C ${APACHE_DOC_ROOT} \
|
&& urpmi --force wget postgresql15 phppgadmin \
|
||||||
&& mv ${APACHE_DOC_ROOT}/phppgadmin-${PHPPGADMIN_COMMIT} ${APACHE_DOC_ROOT}/phppgadmin \
|
&& mv /etc/httpd/conf/sites.d/phppgadmin.conf ${PHPPGADMIN_HTTPD_CONFIG} \
|
||||||
&& sed -i 's/$_SERVER\['\''REQUEST_URI'\''\]/preg_replace(\"\/^\\\/phppgadmin\\\/\/", "", $_SERVER['\''REQUEST_URI'\''])/g' ${APACHE_DOC_ROOT}/phppgadmin/display.php \
|
&& sed -i -e '/<Directory .*/,/<\/Directory>/d' ${PHPPGADMIN_HTTPD_CONFIG} \
|
||||||
&& cp ${APACHE_DOC_ROOT}/phppgadmin/conf/config.inc.php-dist ${APACHE_DOC_ROOT}/phppgadmin/conf/config.inc.php \
|
&& 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 \
|
&& echo -e "${TOOLSD}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/toolsd \
|
||||||
&& chmod a+x /etc/init.d/toolsd \
|
&& chmod a+x /etc/init.d/toolsd \
|
||||||
&& ln -s /etc/init.d/toolsd /etc/rcD.d/S40toolsd \
|
&& ln -s /etc/init.d/toolsd /etc/rcD.d/S40toolsd \
|
||||||
&& mkdir -p ${REDPANDA_CONSOLE_HOME}/bin ${REDPANDA_CONSOLE_HOME}/etc \
|
&& 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://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 \
|
&& echo -e "${REDPANDA_CONSOLED}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/redpanda_consoled \
|
||||||
&& chmod a+x /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 \
|
&& ln -s /etc/init.d/redpanda_consoled /etc/rcD.d/S45redpanda_consoled \
|
||||||
&& echo -e "${REDPANDA_CONSOLED_INI}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/supervisord.d/redpanda_consoled.ini
|
&& echo -e "${REDPANDA_CONSOLED_INI}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/supervisord.d/redpanda_consoled.ini
|
||||||
|
|||||||
@@ -5,11 +5,12 @@ 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.
|
This project aims to build a docker image embeding some usefull tools to tests other images from Rx3 packaging projects.
|
||||||
|
|
||||||
Features:
|
Features:
|
||||||
- Curtently based on rx3-docker/php-apache:1.4.0-mga9 image,
|
- Curtently based on rx3-docker/php-apache:1.6.2-mga9 image,
|
||||||
- PHPPGAdmin (Mentax GitHub 2024/07 commit) installed (URL: http://localhost:xxxx/phppgadmin/),
|
- PHPPGAdmin (Mentax GitHub 2025/05/09 10926c9 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 (V 2.7.2),
|
||||||
- RedPenda Console service disbled by default.
|
- RedPenda Console service disbled by default (TOOLS_RPC_ENABLED variable).
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Enjoy it!
|
Enjoy it!
|
||||||
|
|||||||
@@ -1,8 +1,57 @@
|
|||||||
------------------------------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
Rx3-Docker/Tools V 1.2.3 - A. GIBERT - 2024/12/31
|
Rx3-Docker/Tools V 1.2.8 - A. GIBERT - 2026/02/16
|
||||||
------------------------------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
- Add RedPanda Console enabling via TOOLS_RPC_ENABLE environement variable,
|
- Add ISL support,
|
||||||
|
- Use now rx3-docker/php-apache:1.6.2-mga9 image,
|
||||||
|
- Rebuild for updates.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
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
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
- Use now rx3-docker/php-apache:1.5.3-mga9 image,
|
||||||
|
- Fix volume path bug in compose file.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
Rx3-Docker/Tools V 1.2.4 - A. GIBERT - 2025/03/08
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
- Use now rx3-docker/php-apache:1.5.2-mga9 image.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
Rx3-Docker/Tools V 1.2.3 - A. GIBERT - 2025/01/02
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
- Add RedPanda Console enabling via TOOLS_RPC_ENABLED environment variable,
|
||||||
- Use now rx3-docker/php-apache:1.5.1-mga9 image.
|
- Use now rx3-docker/php-apache:1.5.1-mga9 image.
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ services:
|
|||||||
IMG_NAME_FULL: ${TOOLS_IMG_NAME_FULL}
|
IMG_NAME_FULL: ${TOOLS_IMG_NAME_FULL}
|
||||||
IMG_VERSION: ${TOOLS_IMG_VERSION}
|
IMG_VERSION: ${TOOLS_IMG_VERSION}
|
||||||
IMG_MAINTAINER: ${TOOLS_IMG_MAINTAINER}
|
IMG_MAINTAINER: ${TOOLS_IMG_MAINTAINER}
|
||||||
|
IMG_URL: ${TOOLS_IMG_URL}
|
||||||
IMG_FROM_URL: ${TOOLS_IMG_FROM_URL}
|
IMG_FROM_URL: ${TOOLS_IMG_FROM_URL}
|
||||||
|
|
||||||
APACHE_DOC_ROOT: ${TOOLS_DOC_ROOT}
|
APACHE_DOC_ROOT: ${TOOLS_DOC_ROOT}
|
||||||
@@ -47,9 +48,9 @@ services:
|
|||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
# - ./var/www/html:${TOOLS_DOC_ROOT}
|
# - ./var/www/html:${TOOLS_DOC_ROOT}
|
||||||
- .${TOOLS_LOG_INIT_EXT}:${TOOLS_LOG_INIT_INT}
|
- ./${TOOLS_LOG_INIT_EXT}:${TOOLS_LOG_INIT_INT}
|
||||||
- .${TOOLS_LOG_SV_EXT}:${TOOLS_LOG_SV_INT}
|
- ./${TOOLS_LOG_SV_EXT}:${TOOLS_LOG_SV_INT}
|
||||||
- .${TOOLS_LOG_HTTPD_EXT}:${TOOLS_LOG_HTTPD_INT}
|
- ./${TOOLS_LOG_HTTPD_EXT}:${TOOLS_LOG_HTTPD_INT}
|
||||||
|
|
||||||
ports:
|
ports:
|
||||||
- "127.0.0.1:${TOOLS_PORT_SV_EXT}:${TOOLS_PORT_SV_INT}"
|
- "127.0.0.1:${TOOLS_PORT_SV_EXT}:${TOOLS_PORT_SV_INT}"
|
||||||
|
|||||||
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 |
|
# | 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.5.1-mga9 - - 8070 80 8092 8080 apache apache
|
docker_service_add TOOLS tools ${ORG_URL_PREFIX} - "Rx3-Docker/Tools" 1.2.8-mga9 ${ORG_URL_PREFIX} php-apache 1.6.2-mga9 - - 8070 80 8092 8080 apache apache
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user