Compare commits
No commits in common. "master" and "tools-1.2.0" have entirely different histories.
master
...
tools-1.2.
44
Dockerfile
44
Dockerfile
@ -33,42 +33,11 @@ ARG REDPANDA_CONSOLE_CONFIG="${REDPANDA_CONSOLE_HOME}/etc/redpanda-console-confi
|
||||
#-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
ARG TOOLSD='#!/bin/bash \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\
|
||||
set ${vars} \n\
|
||||
\n\
|
||||
eval read -r -a $2 \<\<\< "\${$1}" \n\
|
||||
done \n\
|
||||
\n\
|
||||
IFS=" " \n\
|
||||
\n\
|
||||
i=0 \n\
|
||||
while [[ ${i} -lt ${#host[@]} ]] \n\
|
||||
do \n\
|
||||
for var in desc host port \n\
|
||||
do \n\
|
||||
eval echo -e "`\t\$conf`[\`servers\`][${i}][\`${var}\`]` = `\`\${${var}[${i}]}\`\;" >> '${PHPPGADMIN_CONFIG}' \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\
|
||||
done \n\
|
||||
\n\
|
||||
echo "?>" >> '${PHPPGADMIN_CONFIG}''
|
||||
sed -i "s/$conf\[`servers`\]\[0\]\[`desc`\] = `PostgreSQL`;/$conf\[`servers`\]\[0\]\[`desc`\] = `${POSTGRESQL_SERVER_NAME}`;/" '${PHPPGADMIN_CONFIG}' \n\
|
||||
sed -i "s/$conf\[`servers`\]\[0\]\[`host`\] = ``;/$conf\[`servers`\]\[0\]\[`host`\] = `${POSTGRESQL_HOST}`;/" '${PHPPGADMIN_CONFIG}' \n\
|
||||
sed -i "s/$conf\[`servers`\]\[0\]\[`port`\] = 5432;/$conf\[`servers`\]\[0\]\[`port`\] = ${POSTGRESQL_PORT};/" '${PHPPGADMIN_CONFIG}' \n\
|
||||
sed -i "s/$conf\[`extra_login_security`\] = true;/$conf\[`extra_login_security`\] = false;/" '${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\
|
||||
@ -93,13 +62,14 @@ command='${REDPANDA_CONSOLE_HOME}'/bin/redpanda-console -config.filepath '${REDP
|
||||
|
||||
|
||||
|
||||
RUN urpmi --force wget postgresql15 \
|
||||
#RUN urpmi --force wget phpmyadmin \
|
||||
RUN urpmi --force wget \
|
||||
&& 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 \
|
||||
&& 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 \
|
||||
&& ln -s /etc/init.d/toolsd /etc/rcD.d/S40toolsd \
|
||||
&& mkdir -p ${REDPANDA_CONSOLE_HOME}/bin ${REDPANDA_CONSOLE_HOME}/etc \
|
||||
|
||||
@ -7,7 +7,7 @@ This project aims to build a docker image embeding some usefull tools to tests o
|
||||
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,
|
||||
- PostgreSQL server name, host & port configurable,
|
||||
- RedPenda Console tool (V2.7.2).
|
||||
|
||||
|
||||
|
||||
@ -1,20 +1,3 @@
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
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
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
- Add multi-database server support to PHPPGAdmin.
|
||||
|
||||
|
||||
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
Rx3-Docker/Tools V 1.2.0 - A. GIBERT - 2024/11/24
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
@ -5,7 +5,7 @@ name: ${HOST_NAME_PREFIX}
|
||||
|
||||
services:
|
||||
|
||||
tools:
|
||||
webtools:
|
||||
container_name: ${TOOLS_HOST_NAME}
|
||||
hostname: ${TOOLS_HOST_NAME}
|
||||
|
||||
|
||||
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.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.0-mga9 ${ORG_URL_PREFIX} php-apache 1.4.0-mga9 - - 8070 80 8092 8080 apache apache
|
||||
|
||||
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user