Compare commits
3 Commits
tools-1.2.
...
tools-1.2.
| Author | SHA1 | Date | |
|---|---|---|---|
| e0e13956fd | |||
| 5d33ede3f5 | |||
| 86f481f16a |
38
Dockerfile
38
Dockerfile
@@ -33,9 +33,7 @@ ARG REDPANDA_CONSOLE_CONFIG="${REDPANDA_CONSOLE_HOME}/etc/redpanda-console-confi
|
|||||||
#-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||||
ARG TOOLSD='#!/bin/bash \n\
|
ARG TOOLSD='#!/bin/bash \n\
|
||||||
\n\
|
\n\
|
||||||
sed -i "s/\$conf\[`servers`\]\[0\]\[`desc`\]/\/\/\$conf\[`servers`\]\[0\]\[`desc`\]/" '${PHPPGADMIN_CONFIG}' \n\
|
sed -i "s/\t\$conf\[`servers`\]/\t\/\/\ $conf\[`servers`\]/" '${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\
|
|
||||||
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\
|
||||||
@@ -55,8 +53,14 @@ while [[ ${i} -lt ${#host[@]} ]]
|
|||||||
do \n\
|
do \n\
|
||||||
for var in desc host port \n\
|
for var in desc host port \n\
|
||||||
do \n\
|
do \n\
|
||||||
eval echo "`\$conf`[\`servers\`][${i}][\`${var}\`] = \`\${${var}[${i}]}\`\;" >> '${PHPPGADMIN_CONFIG}' \n\
|
eval echo -e "`\t\$conf`[\`servers\`][${i}][\`${var}\`]` = `\`\${${var}[${i}]}\`\;" >> '${PHPPGADMIN_CONFIG}' \n\
|
||||||
done \n\
|
done \n\
|
||||||
|
\n\
|
||||||
|
echo -e "\t\$conf[`servers`][${i}][`sslmode`] = `allow`;" >> '${PHPPGADMIN_CONFIG}' \n\
|
||||||
|
echo -e "\t\$conf[`servers`][${i}][`defaultdb`] = `postgres`;" >> '${PHPPGADMIN_CONFIG}' \n\
|
||||||
|
echo -e "\t\$conf[`servers`][${i}][`pg_dump_path`] = `/usr/bin/pg_dump`;" >> '${PHPPGADMIN_CONFIG}' \n\
|
||||||
|
echo -e "\t\$conf[`servers`][${i}][`pg_dumpall_path`] = `/usr/bin/pg_dumpall`;" >> '${PHPPGADMIN_CONFIG}' \n\
|
||||||
|
\n\
|
||||||
i=$(( ${i} + 1)) \n\
|
i=$(( ${i} + 1)) \n\
|
||||||
done \n\
|
done \n\
|
||||||
\n\
|
\n\
|
||||||
@@ -66,16 +70,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'
|
||||||
#-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
#-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||||
@@ -86,14 +95,13 @@ command='${REDPANDA_CONSOLE_HOME}'/bin/redpanda-console -config.filepath '${REDP
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
#RUN urpmi --force wget phpmyadmin \
|
RUN urpmi --force wget postgresql15 \
|
||||||
RUN urpmi --force wget \
|
|
||||||
&& mkdir -p /var/www/appl \
|
&& 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} \
|
&& 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 \
|
&& 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 \
|
&& 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 \
|
&& cp ${APACHE_DOC_ROOT}/phppgadmin/conf/config.inc.php-dist ${APACHE_DOC_ROOT}/phppgadmin/conf/config.inc.php \
|
||||||
&& 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 \
|
||||||
|
|||||||
@@ -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 (TOOLS_RPC_ENABLED variable).
|
||||||
|
|
||||||
|
|
||||||
Enjoy it!
|
Enjoy it!
|
||||||
|
|||||||
@@ -1,3 +1,29 @@
|
|||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
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.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
Rx3-Docker/Tools V 1.2.2 - A. GIBERT - 2024/12/16
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
- Add PostgreSQL client package to allow PHPPGAdmin database export,
|
||||||
|
- Fix PHPPGAdmin config.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
------------------------------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
Rx3-Docker/Tools V 1.2.1 - A. GIBERT - 2024/12/14
|
Rx3-Docker/Tools V 1.2.1 - A. GIBERT - 2024/12/14
|
||||||
------------------------------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
@@ -22,7 +48,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.
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ name: ${HOST_NAME_PREFIX}
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
|
|
||||||
webtools:
|
tools:
|
||||||
container_name: ${TOOLS_HOST_NAME}
|
container_name: ${TOOLS_HOST_NAME}
|
||||||
hostname: ${TOOLS_HOST_NAME}
|
hostname: ${TOOLS_HOST_NAME}
|
||||||
|
|
||||||
@@ -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:
|
||||||
|
|||||||
4
env.dist
4
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.1-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.4-mga9 ${ORG_URL_PREFIX} php-apache 1.5.2-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"
|
||||||
|
|||||||
Reference in New Issue
Block a user