From 2a04cd8c43d483d5abd455940ff3e3a1378eec67 Mon Sep 17 00:00:00 2001 From: "Arnaud G. GIBERT" Date: Thu, 28 May 2026 15:36:40 +0200 Subject: [PATCH] - Fix isl args in Dockerfile. --- Dockerfile | 4 ++-- ReadMe.txt | 2 +- ReleaseNotes.txt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index db3d92b..d8b6ef9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -243,8 +243,8 @@ fi \n\ cp '${SERVER_SV_HTTPD_CSS}.ref' '${SERVER_SV_HTTPD_CSS}' \n\ cp '${SERVER_SV_HTTPD_PAGE}.ref' '${SERVER_SV_HTTPD_PAGE}' \n\ -sed -i -e "s%IMG_NAME_VERSION%$(isl_top -i)%" '${SERVER_SV_HTTPD_PAGE}' \n\ -sed -i -e "s%IMG_STACK_LOG%$(isl_html_dump -i)%" '${SERVER_SV_HTTPD_PAGE}' \n\ +sed -i -e "s%IMG_NAME_VERSION%$(isl --top --image)%" '${SERVER_SV_HTTPD_PAGE}' \n\ +sed -i -e "s%IMG_STACK_LOG%$(isl --html-dump --inline)%" '${SERVER_SV_HTTPD_PAGE}' \n\ \n\ exec supervisord -c /etc/supervisord.conf' #----------------------------------------------------------------------------------------------------------------------- diff --git a/ReadMe.txt b/ReadMe.txt index 07caaf5..fa84a94 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -5,7 +5,7 @@ Welcome to Rx3-Docker/Server docker image! This project aims to build a Mageia server docker image to be used by other Rx3 packaging projects. Features: - - Curtently based on rx3-docker/base:1.4.0-mga9 image, + - Curtently based on rx3-docker/base:1.5.0-mga9 image, - Init script calling in order sub scripts in /etc/init.d & /etc/rcD.d, - supervisord managing services, - supervisord httpd configured and enabled by default, diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 0045a3f..b366d6c 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,9 +1,9 @@ ------------------------------------------------------------------------------------------------------------------------------------ -Rx3-Docker/Server V 1.4.0 - A. GIBERT - 2026/05/28 +Rx3-Docker/Server V 1.4.0 - A. GIBERT - 2026/05/30 ------------------------------------------------------------------------------------------------------------------------------------ - Now use rx3-docker/base:1.5.0-mga9 image, -- Now usedocker-tools-1.5.2. +- Now use docker-tools-1.5.2.