Compare commits
1 Commits
tools-1.3.
...
tools-1.4.
| Author | SHA1 | Date | |
|---|---|---|---|
| d38a09cd75 |
@@ -151,7 +151,7 @@ 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 --force wget postgresql15 phppgadmin mariadb-client phpmyadmin \
|
||||
&& mv /etc/httpd/conf/sites.d/phppgadmin.conf ${PHPPGADMIN_HTTPD_CONFIG} \
|
||||
@@ -166,8 +166,8 @@ RUN . /etc/profile.d/rx3.sh && isl_add ${IMG_URL}
|
||||
&& 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 \
|
||||
&& 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/24.2/shared/_attachments/redpanda-console-config.yaml" > ${REDPANDA_CONSOLE_CONFIG}.ref \
|
||||
&& 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://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 \
|
||||
&& chmod a+x /etc/init.d/redpanda_consoled \
|
||||
&& ln -s /etc/init.d/redpanda_consoled /etc/rcD.d/S45redpanda_consoled \
|
||||
|
||||
@@ -5,7 +5,7 @@ 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.
|
||||
|
||||
Features:
|
||||
- Curtently based on rx3-docker/php-apache:1.6.3-mga9 image,
|
||||
- Curtently based on rx3-docker/php-apache:1.7.0-mga9 image,
|
||||
- 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,
|
||||
|
||||
@@ -1,8 +1,20 @@
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
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
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
- Use now rx3-docker/php-apache:1.6.3-mga9 image.
|
||||
- Now use rx3-docker/php-apache:1.6.3-mga9 image.
|
||||
|
||||
|
||||
|
||||
@@ -19,7 +31,7 @@ Rx3-Docker/Tools V 1.2.8 - A. GIBERT - 2026/02/16
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
- 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.
|
||||
|
||||
|
||||
@@ -28,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
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
- Use now the rx3 phpgadmin rpm,
|
||||
- Now use 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,
|
||||
- Now use rx3-docker/php-apache:1.6.0-mga9 image,
|
||||
- Rebuild for updates.
|
||||
|
||||
|
||||
@@ -40,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
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
- 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,
|
||||
- Fix RedPanda Console config file download.
|
||||
|
||||
@@ -50,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
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
- 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.
|
||||
|
||||
|
||||
@@ -59,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
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
- Use now rx3-docker/php-apache:1.5.2-mga9 image.
|
||||
- Now use rx3-docker/php-apache:1.5.2-mga9 image.
|
||||
|
||||
|
||||
|
||||
@@ -68,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,
|
||||
- Use now rx3-docker/php-apache:1.5.1-mga9 image.
|
||||
- Now use rx3-docker/php-apache:1.5.1-mga9 image.
|
||||
|
||||
|
||||
|
||||
@@ -105,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,
|
||||
- New version naming standard,
|
||||
- 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.
|
||||
|
||||
|
||||
|
||||
@@ -27,6 +27,8 @@ services:
|
||||
restart: unless-stopped
|
||||
|
||||
environment:
|
||||
SERVER_CROND_ENABLED: ${TOOLS_CROND_ENABLED}
|
||||
|
||||
APACHE_DOC_ROOT: ${TOOLS_DOC_ROOT}
|
||||
|
||||
POSTGRESQL_SERVER_NAME: ${POSTGRESQL_SERVER_NAME}
|
||||
|
||||
6
env.dist
6
env.dist
@@ -7,6 +7,7 @@
|
||||
|
||||
ORG_NAME="rx3-docker"
|
||||
ORG_REGISTRY="docker.xor.rx3:5000"
|
||||
ORG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
|
||||
|
||||
ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}"
|
||||
|
||||
@@ -16,6 +17,7 @@ ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}"
|
||||
# Image Settings
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
APPL_NAME=""
|
||||
HOST_NAME_PREFIX=""
|
||||
|
||||
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 |
|
||||
#------------------+----------+--------------------------+--------------------+------------------+-------------------------------+-----------------+--------------------+---------------+------------+--------------+------------+-------+-------+-------+-------+--------------+--------------+
|
||||
|
||||
docker_service_add TOOLS tools ${ORG_URL_PREFIX} - "Rx3-Docker/Tools" 1.3.1-mga9 ${ORG_URL_PREFIX} php-apache 1.6.3-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
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
TOOLS_CROND_ENABLED="TRUE"
|
||||
|
||||
TOOLS_LOG_HTTPD_INT="/var/log/httpd"
|
||||
TOOLS_LOG_HTTPD_EXT="./var/log/httpd"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user