Compare commits
4 Commits
tools-1.2.
...
tools-1.2.
| Author | SHA1 | Date | |
|---|---|---|---|
| a2dcf6b8dd | |||
| a49fa5e7ff | |||
| 9426e53e31 | |||
| e0e13956fd |
@@ -66,9 +66,6 @@ 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\
|
||||||
@@ -98,7 +95,8 @@ command='${REDPANDA_CONSOLE_HOME}'/bin/redpanda-console -config.filepath '${REDP
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
RUN urpmi --force wget postgresql15 \
|
RUN urpmi.update -a \
|
||||||
|
&& urpmi --force wget postgresql15 \
|
||||||
&& 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 \
|
||||||
@@ -109,7 +107,7 @@ RUN urpmi --force wget postgresql15
|
|||||||
&& 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} \
|
||||||
&& 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 \
|
||||||
|
|||||||
@@ -5,11 +5,11 @@ 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.5.4-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 (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,35 @@
|
|||||||
------------------------------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
Rx3-Docker/Tools V 1.2.3 - A. GIBERT - 2024/12/31
|
Rx3-Docker/Tools V 1.2.6 - A. GIBERT - 2025/09/19
|
||||||
------------------------------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
- Add RedPanda Console enabling via TOOLS_RPC_ENABLE environement variable,
|
- 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.
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -47,9 +47,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.6-mga9 ${ORG_URL_PREFIX} php-apache 1.5.4-mga9 - - 8070 80 8092 8080 apache apache
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user