diff --git a/Dockerfile b/Dockerfile index ef9c8ef..f899547 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,6 +9,7 @@ ARG IMG_NAME ARG IMG_NAME_FULL ARG IMG_VERSION ARG IMG_MAINTAINER +ARG IMG_URL LABEL org.rx3.${IMG_NAME}.name=${IMG_NAME_FULL} LABEL org.rx3.${IMG_NAME}.version=${IMG_VERSION} @@ -66,6 +67,8 @@ done echo "?>" >> '${PHPPGADMIN_CONFIG}'' #------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- + + #------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ARG REDPANDA_CONSOLED='#!/bin/bash \n\ \n\ @@ -93,6 +96,8 @@ then fi' #------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- + + #------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ARG REDPANDA_CONSOLED_INI='[program:redpanda_consoled] \n\ directory='${REDPANDA_CONSOLE_HOME}' \n\ @@ -102,7 +107,8 @@ user=apache' -RUN urpmi.update -a \ +RUN . /etc/profile.d/rx3.sh && isl_add ${IMG_URL} \ + && urpmi.update -a \ && urpmi --force wget postgresql15 phppgadmin \ && mv /etc/httpd/conf/sites.d/phppgadmin.conf ${PHPPGADMIN_HTTPD_CONFIG} \ && sed -i -e '//d' ${PHPPGADMIN_HTTPD_CONFIG} \ diff --git a/ReadMe.txt b/ReadMe.txt index a5b1ce5..3a7f79a 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -5,13 +5,14 @@ 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.0-mga9 image, + - Curtently based on rx3-docker/php-apache:1.6.2-mga9 image, - PHPPGAdmin (Mentax GitHub 2025/05/09 10926c9 commit) installed (URL: http://localhost:xxxx/phppgadmin/), - PostgreSQL server name, host & port configurable with multi-server support, - RedPenda Console tool (V 2.7.2), - RedPenda Console service disbled by default (TOOLS_RPC_ENABLED variable). + Enjoy it! Your Rx3 Team. diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 17c37eb..a330e66 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,13 @@ +------------------------------------------------------------------------------------------------------------------------------------ +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, +- Rebuild for updates. + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3-Docker/Tools V 1.2.7 - A. GIBERT - 2025/12/02 ------------------------------------------------------------------------------------------------------------------------------------ diff --git a/compose.yaml b/compose.yaml index eb7c467..eadb3f0 100644 --- a/compose.yaml +++ b/compose.yaml @@ -18,6 +18,7 @@ services: IMG_NAME_FULL: ${TOOLS_IMG_NAME_FULL} IMG_VERSION: ${TOOLS_IMG_VERSION} IMG_MAINTAINER: ${TOOLS_IMG_MAINTAINER} + IMG_URL: ${TOOLS_IMG_URL} IMG_FROM_URL: ${TOOLS_IMG_FROM_URL} APACHE_DOC_ROOT: ${TOOLS_DOC_ROOT} diff --git a/env.dist b/env.dist index 2cae175..858d233 100644 --- a/env.dist +++ b/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.7-mga9 ${ORG_URL_PREFIX} php-apache 1.6.0-mga9 - - 8070 80 8092 8080 apache apache +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