Compare commits
3 Commits
tools-1.2.
...
tools-1.4.
| Author | SHA1 | Date | |
|---|---|---|---|
| d38a09cd75 | |||
| 1d33bc4be6 | |||
| 48a4458e6d |
60
Dockerfile
60
Dockerfile
@@ -23,6 +23,9 @@ ARG REDPANDA_CONSOLE_PORT
|
|||||||
ARG PHPPGADMIN_HTTPD_CONFIG="/etc/httpd/conf/sites.d/default_vhost.d/60-phppgadmin.conf"
|
ARG PHPPGADMIN_HTTPD_CONFIG="/etc/httpd/conf/sites.d/default_vhost.d/60-phppgadmin.conf"
|
||||||
ARG PHPPGADMIN_CONFIG="/etc/phppgadmin/config.inc.php"
|
ARG PHPPGADMIN_CONFIG="/etc/phppgadmin/config.inc.php"
|
||||||
|
|
||||||
|
ARG PHPMYADMIN_HTTPD_CONFIG="/etc/httpd/conf/sites.d/default_vhost.d/60-phpmyadmin.conf"
|
||||||
|
ARG PHPMYADMIN_CONFIG="/etc/phpmyadmin/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"
|
||||||
|
|
||||||
@@ -31,6 +34,8 @@ ARG REDPANDA_CONSOLE_CONFIG="${REDPANDA_CONSOLE_HOME}/etc/redpanda-console-confi
|
|||||||
#-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||||
ARG TOOLSD='#!/bin/bash \n\
|
ARG TOOLSD='#!/bin/bash \n\
|
||||||
\n\
|
\n\
|
||||||
|
# PostgreSQL \n\
|
||||||
|
\n\
|
||||||
cp '${PHPPGADMIN_CONFIG}'.ref '${PHPPGADMIN_CONFIG}' \n\
|
cp '${PHPPGADMIN_CONFIG}'.ref '${PHPPGADMIN_CONFIG}' \n\
|
||||||
chown apache:root '${PHPPGADMIN_CONFIG}' \n\
|
chown apache:root '${PHPPGADMIN_CONFIG}' \n\
|
||||||
\n\
|
\n\
|
||||||
@@ -64,7 +69,46 @@ do
|
|||||||
i=$(( ${i} + 1)) \n\
|
i=$(( ${i} + 1)) \n\
|
||||||
done \n\
|
done \n\
|
||||||
\n\
|
\n\
|
||||||
echo "?>" >> '${PHPPGADMIN_CONFIG}''
|
echo "?>" >> '${PHPPGADMIN_CONFIG}' \n\
|
||||||
|
\n\
|
||||||
|
\n\
|
||||||
|
# MariaDB \n\
|
||||||
|
\n\
|
||||||
|
cp '${PHPMYADMIN_CONFIG}'.ref '${PHPMYADMIN_CONFIG}' \n\
|
||||||
|
chown apache:root '${PHPMYADMIN_CONFIG}' \n\
|
||||||
|
\n\
|
||||||
|
sed -i -E `s/(^\$cfg`"\[`blowfish_secret`\] = `)([^`]{32})[^`]*`/\1\2`/g" '${PHPMYADMIN_CONFIG}' \n\
|
||||||
|
sed -i "s/^\$cfg\[`Servers`\]/\/\/\ $cfg\[`Servers`\]/" '${PHPMYADMIN_CONFIG}' \n\
|
||||||
|
\n\
|
||||||
|
for vars in MARIADB_SERVER_NAME:verbose MARIADB_HOST:host MARIADB_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\
|
||||||
|
j=$(( ${i} + 1)) \n\
|
||||||
|
\n\
|
||||||
|
for var in verbose host port \n\
|
||||||
|
do \n\
|
||||||
|
eval echo -e "`\$cfg`[\`Servers\`][${j}][\`${var}\`]` = `\`\${${var}[${i}]}\`\;" >> '${PHPMYADMIN_CONFIG}' \n\
|
||||||
|
done \n\
|
||||||
|
\n\
|
||||||
|
echo -e "\$cfg[`Servers`][${j}][`auth_type`] = `cookie`;" >> '${PHPMYADMIN_CONFIG}' \n\
|
||||||
|
echo -e "\$cfg[`Servers`][${j}][`compress`] = `false`;" >> '${PHPMYADMIN_CONFIG}' \n\
|
||||||
|
echo -e "\$cfg[`Servers`][${j}][`AllowNoPassword`] = `false`;" >> '${PHPMYADMIN_CONFIG}' \n\
|
||||||
|
\n\
|
||||||
|
i=$(( ${i} + 1)) \n\
|
||||||
|
done \n\
|
||||||
|
\n\
|
||||||
|
echo "?>" >> '${PHPMYADMIN_CONFIG}
|
||||||
|
|
||||||
#-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
@@ -107,19 +151,23 @@ user=apache'
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
RUN . /etc/profile.d/rx3.sh && isl_add ${IMG_URL} \
|
RUN . /etc/profile.d/rx3.sh && isl --add ${IMG_URL} \
|
||||||
&& urpmi.update -a \
|
&& urpmi.update -a \
|
||||||
&& urpmi --force wget postgresql15 phppgadmin \
|
&& urpmi --force wget postgresql15 phppgadmin mariadb-client phpmyadmin \
|
||||||
&& mv /etc/httpd/conf/sites.d/phppgadmin.conf ${PHPPGADMIN_HTTPD_CONFIG} \
|
&& mv /etc/httpd/conf/sites.d/phppgadmin.conf ${PHPPGADMIN_HTTPD_CONFIG} \
|
||||||
&& sed -i -e '/<Directory .*/,/<\/Directory>/d' ${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} \
|
&& echo -e "<Directory /var/www/phppgadmin>\n AllowOverride All\n Require all granted\n</Directory>" >> ${PHPPGADMIN_HTTPD_CONFIG} \
|
||||||
&& mv ${PHPPGADMIN_CONFIG} ${PHPPGADMIN_CONFIG}.ref \
|
&& mv ${PHPPGADMIN_CONFIG} ${PHPPGADMIN_CONFIG}.ref \
|
||||||
|
&& mv /etc/httpd/conf/sites.d/phpmyadmin.conf ${PHPMYADMIN_HTTPD_CONFIG} \
|
||||||
|
&& sed -i -e '/<Directory .*/,/<\/Directory>/d' ${PHPMYADMIN_HTTPD_CONFIG} \
|
||||||
|
&& echo -e "<Directory /usr/share/phpmyadmin>\n AllowOverride All\n Require all granted\n</Directory>" >> ${PHPMYADMIN_HTTPD_CONFIG} \
|
||||||
|
&& mv ${PHPMYADMIN_CONFIG} ${PHPMYADMIN_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://www.rx3.net/data/external/redpanda/redpanda_console_2.7.2_linux_amd64.tar.gz" | tar xzf - -C ${REDPANDA_CONSOLE_HOME}/bin \
|
||||||
&& wget -q -O- "https://docs.redpanda.com/24.2/shared/_attachments/redpanda-console-config.yaml" > ${REDPANDA_CONSOLE_CONFIG}.ref \
|
&& wget -q -O- "https://www.rx3.net/data/external/redpanda/redpanda-console-config-27.7.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 \
|
||||||
|
|||||||
@@ -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.6.2-mga9 image,
|
- Curtently based on rx3-docker/php-apache:1.7.0-mga9 image,
|
||||||
- PHPPGAdmin (Mentax GitHub 2025/05/09 10926c9 commit) installed (URL: http://localhost:xxxx/phppgadmin/),
|
- phpPGAdmin (Mentax GitHub 2025/05/09 10926c9 commit), URL: http://localhost/phppgadmin/,
|
||||||
|
- phpMyAdmin (V 5.2.3), URL: http://localhost/phpmyadmin/,
|
||||||
- PostgreSQL server name, host & port configurable with multi-server support,
|
- PostgreSQL server name, host & port configurable with multi-server support,
|
||||||
- RedPenda Console tool (V 2.7.2),
|
- RedPenda Console tool (V 2.7.2) URL: http://localhost:8080/,
|
||||||
- RedPenda Console service disbled by default (TOOLS_RPC_ENABLED variable).
|
- RedPenda Console service disabled by default (TOOLS_RPC_ENABLED variable).
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,9 +1,37 @@
|
|||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
Rx3-Docker/Tools V 1.4.0 - A. GIBERT - 2026/05/30
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
- Now use rx3-docker/php-apache:1.7.0-mga9 image,
|
||||||
|
- Now use docker-tools-1.5.2,
|
||||||
|
- Enable cron daemon to clean-up dead php sessions,
|
||||||
|
- Use now RedPanda files from Rx3 web site,
|
||||||
|
- Rebuild for updates.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
Rx3-Docker/Tools V 1.3.1 - A. GIBERT - 2026/03/01
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
- Now use rx3-docker/php-apache:1.6.3-mga9 image.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
Rx3-Docker/Tools V 1.3.0 - A. GIBERT - 2026/02/27
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
- Add PhpMyAdmin.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
------------------------------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
Rx3-Docker/Tools V 1.2.8 - A. GIBERT - 2026/02/16
|
Rx3-Docker/Tools V 1.2.8 - A. GIBERT - 2026/02/16
|
||||||
------------------------------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
- Add ISL support,
|
- Add ISL support,
|
||||||
- Use now rx3-docker/php-apache:1.6.2-mga9 image,
|
- Now use rx3-docker/php-apache:1.6.2-mga9 image,
|
||||||
- Rebuild for updates.
|
- Rebuild for updates.
|
||||||
|
|
||||||
|
|
||||||
@@ -12,10 +40,10 @@ Rx3-Docker/Tools V 1.2.8 - A. GIBERT - 2026/02/16
|
|||||||
Rx3-Docker/Tools V 1.2.7 - A. GIBERT - 2025/12/02
|
Rx3-Docker/Tools V 1.2.7 - A. GIBERT - 2025/12/02
|
||||||
------------------------------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
- Use now the rx3 phpgadmin rpm,
|
- Now use the rx3 phpgadmin rpm,
|
||||||
- Fix phppgadmin config user name,
|
- Fix phppgadmin config user name,
|
||||||
- Run RedPanda Console under apache user and not root,
|
- Run RedPanda Console under apache user and not root,
|
||||||
- Use now rx3-docker/php-apache:1.6.0-mga9 image,
|
- Now use rx3-docker/php-apache:1.6.0-mga9 image,
|
||||||
- Rebuild for updates.
|
- Rebuild for updates.
|
||||||
|
|
||||||
|
|
||||||
@@ -24,7 +52,7 @@ Rx3-Docker/Tools V 1.2.7 - A. GIBERT - 2025/12/02
|
|||||||
Rx3-Docker/Tools V 1.2.6 - A. GIBERT - 2025/09/19
|
Rx3-Docker/Tools V 1.2.6 - A. GIBERT - 2025/09/19
|
||||||
------------------------------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
- Use now rx3-docker/php-apache:1.5.4-mga9 image,
|
- Now use rx3-docker/php-apache:1.5.4-mga9 image,
|
||||||
- Rebuild for updates,
|
- Rebuild for updates,
|
||||||
- Fix RedPanda Console config file download.
|
- Fix RedPanda Console config file download.
|
||||||
|
|
||||||
@@ -34,7 +62,7 @@ Rx3-Docker/Tools V 1.2.6 - A. GIBERT - 2025/09/19
|
|||||||
Rx3-Docker/Tools V 1.2.5 - A. GIBERT - 2025/04/21
|
Rx3-Docker/Tools V 1.2.5 - A. GIBERT - 2025/04/21
|
||||||
------------------------------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
- Use now rx3-docker/php-apache:1.5.3-mga9 image,
|
- Now use rx3-docker/php-apache:1.5.3-mga9 image,
|
||||||
- Fix volume path bug in compose file.
|
- Fix volume path bug in compose file.
|
||||||
|
|
||||||
|
|
||||||
@@ -43,7 +71,7 @@ Rx3-Docker/Tools V 1.2.5 - A. GIBERT - 2025/04/21
|
|||||||
Rx3-Docker/Tools V 1.2.4 - A. GIBERT - 2025/03/08
|
Rx3-Docker/Tools V 1.2.4 - A. GIBERT - 2025/03/08
|
||||||
------------------------------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
- Use now rx3-docker/php-apache:1.5.2-mga9 image.
|
- Now use rx3-docker/php-apache:1.5.2-mga9 image.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -52,7 +80,7 @@ Rx3-Docker/Tools V 1.2.3 - A. GIBERT - 2025/01/02
|
|||||||
------------------------------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
- Add RedPanda Console enabling via TOOLS_RPC_ENABLED environment variable,
|
- Add RedPanda Console enabling via TOOLS_RPC_ENABLED environment variable,
|
||||||
- Use now rx3-docker/php-apache:1.5.1-mga9 image.
|
- Now use rx3-docker/php-apache:1.5.1-mga9 image.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -89,7 +117,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/php-apache:1.4.0-mga9 image,
|
- Now use 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.
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -27,6 +27,8 @@ services:
|
|||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
|
SERVER_CROND_ENABLED: ${TOOLS_CROND_ENABLED}
|
||||||
|
|
||||||
APACHE_DOC_ROOT: ${TOOLS_DOC_ROOT}
|
APACHE_DOC_ROOT: ${TOOLS_DOC_ROOT}
|
||||||
|
|
||||||
POSTGRESQL_SERVER_NAME: ${POSTGRESQL_SERVER_NAME}
|
POSTGRESQL_SERVER_NAME: ${POSTGRESQL_SERVER_NAME}
|
||||||
|
|||||||
6
env.dist
6
env.dist
@@ -7,6 +7,7 @@
|
|||||||
|
|
||||||
ORG_NAME="rx3-docker"
|
ORG_NAME="rx3-docker"
|
||||||
ORG_REGISTRY="docker.xor.rx3:5000"
|
ORG_REGISTRY="docker.xor.rx3:5000"
|
||||||
|
ORG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
|
||||||
|
|
||||||
ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}"
|
ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}"
|
||||||
|
|
||||||
@@ -16,6 +17,7 @@ ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}"
|
|||||||
# Image Settings
|
# Image Settings
|
||||||
#-------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
APPL_NAME=""
|
||||||
HOST_NAME_PREFIX=""
|
HOST_NAME_PREFIX=""
|
||||||
|
|
||||||
PORT_ENV_OFFSET=0
|
PORT_ENV_OFFSET=0
|
||||||
@@ -30,7 +32,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.8-mga9 ${ORG_URL_PREFIX} php-apache 1.6.2-mga9 - - 8070 80 8092 8080 apache apache
|
docker_service_add TOOLS tools ${ORG_URL_PREFIX} - "Rx3-Docker/Tools" 1.4.0-mga9 ${ORG_URL_PREFIX} php-apache 1.7.0-mga9 - - 8070 80 8092 8080 apache apache
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -38,6 +40,8 @@ docker_service_add TOOLS tools ${ORG_URL_PREFIX}
|
|||||||
# User Settings
|
# User Settings
|
||||||
#-------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
TOOLS_CROND_ENABLED="TRUE"
|
||||||
|
|
||||||
TOOLS_LOG_HTTPD_INT="/var/log/httpd"
|
TOOLS_LOG_HTTPD_INT="/var/log/httpd"
|
||||||
TOOLS_LOG_HTTPD_EXT="./var/log/httpd"
|
TOOLS_LOG_HTTPD_EXT="./var/log/httpd"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user