From 9426e53e31a519267ad923afe7f9cde76ad37d25 Mon Sep 17 00:00:00 2001 From: "Arnaud G. GIBERT" Date: Mon, 21 Apr 2025 17:57:23 +0200 Subject: [PATCH] - Use now rx3-docker/php-apache:1.5.3-mga9 image, - Fix volume path bug in compose file. --- Dockerfile | 3 ++- ReadMe.txt | 2 +- ReleaseNotes.txt | 9 +++++++++ compose.yaml | 6 +++--- env.dist | 2 +- 5 files changed, 16 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index e293c3c..03d0caf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -95,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 \ && 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 \ diff --git a/ReadMe.txt b/ReadMe.txt index f07e23c..a8cedd3 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -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.4.0-mga9 image, + - Curtently based on rx3-docker/php-apache:1.5.3-mga9 image, - PHPPGAdmin (Mentax GitHub 2024/07 commit) installed (URL: http://localhost:xxxx/phppgadmin/), - PostgreSQL server name, host & port configurable with multi-server support, - RedPenda Console tool (V2.7.2), diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 73bc301..7ccfc3b 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,12 @@ +------------------------------------------------------------------------------------------------------------------------------------ +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 ------------------------------------------------------------------------------------------------------------------------------------ diff --git a/compose.yaml b/compose.yaml index bcbd63f..eb7c467 100644 --- a/compose.yaml +++ b/compose.yaml @@ -47,9 +47,9 @@ services: volumes: # - ./var/www/html:${TOOLS_DOC_ROOT} - - .${TOOLS_LOG_INIT_EXT}:${TOOLS_LOG_INIT_INT} - - .${TOOLS_LOG_SV_EXT}:${TOOLS_LOG_SV_INT} - - .${TOOLS_LOG_HTTPD_EXT}:${TOOLS_LOG_HTTPD_INT} + - ./${TOOLS_LOG_INIT_EXT}:${TOOLS_LOG_INIT_INT} + - ./${TOOLS_LOG_SV_EXT}:${TOOLS_LOG_SV_INT} + - ./${TOOLS_LOG_HTTPD_EXT}:${TOOLS_LOG_HTTPD_INT} ports: - "127.0.0.1:${TOOLS_PORT_SV_EXT}:${TOOLS_PORT_SV_INT}" diff --git a/env.dist b/env.dist index 9e2140d..d39178d 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.4-mga9 ${ORG_URL_PREFIX} php-apache 1.5.2-mga9 - - 8070 80 8092 8080 apache apache +docker_service_add TOOLS tools ${ORG_URL_PREFIX} - "Rx3-Docker/Tools" 1.2.5-mga9 ${ORG_URL_PREFIX} php-apache 1.5.3-mga9 - - 8070 80 8092 8080 apache apache