From 68f74b8a3c5325dd625e69ba5f77649da30163c6 Mon Sep 17 00:00:00 2001 From: "Arnaud G. GIBERT" Date: Sun, 15 Feb 2026 11:10:22 +0100 Subject: [PATCH] - Add ISL support, - Use now rx3-docker/java-1.1.5-mga9 image, - Rebuild for updates. --- Dockerfile | 7 ++++++- ReadMe.txt | 2 +- ReleaseNotes.txt | 10 ++++++++++ compose.yaml | 1 + env.dist | 4 ++-- 5 files changed, 20 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index ee4e4f9..a419b54 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} @@ -36,6 +37,9 @@ chown -R root:tomcat '${TOMCAT_CONFIG_DIR}' '${TOMCAT_CACHE_DIR}' '${TOMCAT_LI chown -R tomcat:tomcat '${TOMCAT_LOG_DIR}' '${TOMCAT_WORK_DIR} #---------------------------------------------------------------------------------------------------------------- + + + #---------------------------------------------------------------------------------------------------------------- ARG TOMCATD_INI='[program:tomcatd] \n\ command=bash -c "source '${TOMCAT_CONFIG_FILE}' && /usr/libexec/tomcat/server start" \n\ @@ -44,7 +48,8 @@ user=tomcat' -RUN urpmi.update -a \ +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 \ && chmod a+x /etc/init.d/tomcatd \ diff --git a/ReadMe.txt b/ReadMe.txt index a1b6c39..82d733c 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -5,7 +5,7 @@ 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.4-mga9 image, + - Curtently based on rx3-docker/java:1.1.5-mga9 image, - Sync with Tomcat 9.0.111 from Mageia 9 RPM. diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index f28f37c..fba5678 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,13 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3-Docker/Gitea V 1.0.1 - A. GIBERT - 2026/02/15 +------------------------------------------------------------------------------------------------------------------------------------ + +- Add ISL support, +- Use now rx3-docker/java-1.1.5-mga9 image, +- Rebuild for updates. + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3-Docker/Gitea V 1.0.0 - A. GIBERT - 2026/01/10 ------------------------------------------------------------------------------------------------------------------------------------ diff --git a/compose.yaml b/compose.yaml index 83fdc4d..8001714 100644 --- a/compose.yaml +++ b/compose.yaml @@ -19,6 +19,7 @@ services: IMG_NAME_FULL: ${AS_IMG_NAME_FULL} IMG_VERSION: ${AS_IMG_VERSION} IMG_MAINTAINER: ${APPL_MAINTAINER} + IMG_URL: ${AS_IMG_URL} IMG_FROM_URL: ${AS_IMG_FROM_URL} restart: unless-stopped diff --git a/env.dist b/env.dist index de0779e..43fdb34 100644 --- a/env.dist +++ b/env.dist @@ -20,7 +20,7 @@ APPL_NAME="tomcat" APPL_NAME_FULL="Tomcat Server" APPL_NAME_SHORT="tomcat" APPL_ORG="rx3-docker" -APPL_VERSION="1.0.0" +APPL_VERSION="1.0.1" APPL_MAINTAINER='"Arnaud G. GIBERT" ' @@ -76,7 +76,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.4-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.1.5-mga9 - - 8077 8080 - - apache apache