From 274a74c99b4b73adff66e7a3b950472937f8292b Mon Sep 17 00:00:00 2001 From: "Arnaud G. GIBERT" Date: Thu, 28 May 2026 22:15:00 +0200 Subject: [PATCH] - Now use rx3-docker/java:1.2.0-mga9 image, - Now use docker-tools-1.5.2, - Update Tomcat 9.0.118, - Rebuild for updates. --- Dockerfile | 2 +- ReadMe.txt | 4 ++-- ReleaseNotes.txt | 19 +++++++++++++++---- env.dist | 5 +++-- 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index a419b54..698e6ae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,7 +48,7 @@ user=tomcat' -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 tomcat \ && echo -e "${TOMCATD}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/tomcatd \ diff --git a/ReadMe.txt b/ReadMe.txt index 82d733c..b0ea138 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -5,8 +5,8 @@ Welcome to Rx3-Docker/Tomcat docker image! This project aims to build a Tomcat docker image. Features: - - Curtently based on rx3-docker/java:1.1.5-mga9 image, - - Sync with Tomcat 9.0.111 from Mageia 9 RPM. + - Curtently based on rx3-docker/java:1.2.0-mga9 image, + - Sync with Tomcat 9.0.118 from Mageia 9 RPM. diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index bc4d22d..70b789e 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,15 +1,26 @@ ------------------------------------------------------------------------------------------------------------------------------------ -Rx3-Docker/Gitea V 1.0.1 - A. GIBERT - 2026/02/16 +Rx3-Docker/Tomcat V 1.1.0 - A. GIBERT - 2026/05/30 ------------------------------------------------------------------------------------------------------------------------------------ -- Add ISL support, -- Use now rx3-docker/java-1.1.5-mga9 image, +- Now use rx3-docker/java:1.2.0-mga9 image, +- Now use docker-tools-1.5.2, +- Update Tomcat 9.0.118, - Rebuild for updates. ------------------------------------------------------------------------------------------------------------------------------------ -Rx3-Docker/Gitea V 1.0.0 - A. GIBERT - 2026/01/10 +Rx3-Docker/Tomcat V 1.0.1 - A. GIBERT - 2026/02/16 +------------------------------------------------------------------------------------------------------------------------------------ + +- Add ISL support, +- Now use rx3-docker/java-1.1.5-mga9 image, +- Rebuild for updates. + + + +------------------------------------------------------------------------------------------------------------------------------------ +Rx3-Docker/Tomcat V 1.0.0 - A. GIBERT - 2026/01/10 ------------------------------------------------------------------------------------------------------------------------------------ - Initial release, diff --git a/env.dist b/env.dist index 43fdb34..4f9d856 100644 --- a/env.dist +++ b/env.dist @@ -7,6 +7,7 @@ ORG_NAME="rx3-docker" ORG_REGISTRY="docker.xor.rx3:5000" +ORG_MAINTAINER='"Arnaud G. GIBERT" ' ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}" @@ -20,7 +21,7 @@ APPL_NAME="tomcat" APPL_NAME_FULL="Tomcat Server" APPL_NAME_SHORT="tomcat" APPL_ORG="rx3-docker" -APPL_VERSION="1.0.1" +APPL_VERSION="1.1.0" APPL_MAINTAINER='"Arnaud G. GIBERT" ' @@ -76,7 +77,7 @@ DOCKER_TOOLS_EXEPTION_LIBS="postgres:pgsql" # | 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 AS appl-server ${ORG_URL_PREFIX} tomcat "Rx3-Docker/Tomcat" ${APPL_VERSION}-mga9 ${ORG_URL_PREFIX} java 1.1.5-mga9 - - 8077 8080 - - apache apache +docker_service_add AS appl-server ${ORG_URL_PREFIX} tomcat "Rx3-Docker/Tomcat" ${APPL_VERSION}-mga9 ${ORG_URL_PREFIX} java 1.2.0-mga9 - - 8077 8080 - - apache apache