From 4df75aa55f06daa5e660415cf73f2393eb6e5345 Mon Sep 17 00:00:00 2001 From: "Arnaud G. GIBERT" Date: Sun, 15 Feb 2026 00:59:57 +0100 Subject: [PATCH] - Add ISL support, - Use now rx3-docker/java:1.1.5-mga9 & rx3-docker/postgresql:1.1.6-mga9 images, - Rebuild for updates. --- Dockerfile | 4 +++- ReadMe.txt | 2 +- ReleaseNotes.txt | 10 ++++++++++ compose.yaml | 1 + env.dist | 6 +++--- 5 files changed, 18 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 637fdb2..60cc91e 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} @@ -47,7 +48,8 @@ command='${SQUASHTM_STARTUP} -RUN urpmi.update -a \ +RUN . /etc/profile.d/rx3.sh && isl_add ${IMG_URL} \ + && urpmi.update -a \ && urpmi --force wget \ && mkdir /opt/appl \ && useradd -M --home-dir ${SQUASHTM_HOME} --password "" squashtm \ diff --git a/ReadMe.txt b/ReadMe.txt index b2f5b02..c1a52df 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -5,7 +5,7 @@ Welcome to Rx3-Docker/SquashTM docker image! This project aims to build a MantisBT docker image. Features: - - Curtently based on rx3-docker/java-1.1.4-mga9 & rx3-docker/postgresql:1.1.5-mga9 images, + - Curtently based on rx3-docker/java-1.1.5-mga9 & rx3-docker/postgresql:1.1.6-mga9 images, - Sync with SquashTM 9.0.0. diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 85589da..bc8cace 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,13 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3-Docker/SquashTM V 1.0.4 - A. GIBERT - 2026/02/16 +------------------------------------------------------------------------------------------------------------------------------------ + +- Add ISL support, +- Use now rx3-docker/java:1.1.5-mga9 & rx3-docker/postgresql:1.1.6-mga9 images, +- Rebuild for updates. + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3-Docker/SquashTM V 1.0.3 - A. GIBERT - 2025/11/29 ------------------------------------------------------------------------------------------------------------------------------------ diff --git a/compose.yaml b/compose.yaml index f08a4b8..4a87ba3 100644 --- a/compose.yaml +++ b/compose.yaml @@ -57,6 +57,7 @@ services: IMG_NAME_FULL: ${WA_IMG_NAME_FULL} IMG_VERSION: ${WA_IMG_VERSION} IMG_MAINTAINER: ${APPL_MAINTAINER} + IMG_URL: ${WA_IMG_URL} IMG_FROM_URL: ${WA_IMG_FROM_URL} restart: unless-stopped diff --git a/env.dist b/env.dist index 8101b2e..d5b781e 100644 --- a/env.dist +++ b/env.dist @@ -20,7 +20,7 @@ APPL_NAME="squash-tm" APPL_NAME_FULL="Squash Test Manager" APPL_NAME_SHORT="squashtm" APPL_ORG="rx3-docker" -APPL_VERSION="1.0.3" +APPL_VERSION="1.0.4" APPL_MAINTAINER='"Arnaud G. GIBERT" ' @@ -77,9 +77,9 @@ 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 DB database ${ORG_URL_PREFIX} postgresql - 1.1.5-mga9 - - - postgres - - 5432 - - postgres postgres +docker_service_add DB database ${ORG_URL_PREFIX} postgresql - 1.1.6-mga9 - - - postgres - - 5432 - - postgres postgres -docker_service_add WA webapp ${ORG_URL_PREFIX} squashtm "Rx3-Docker/Squash-TM" ${APPL_VERSION}-mga9 ${ORG_URL_PREFIX} java 1.1.4-mga9 - - 8071 8080 - - ${APPL_USER} ${APPL_GROUP} +docker_service_add WA webapp ${ORG_URL_PREFIX} squashtm "Rx3-Docker/Squash-TM" ${APPL_VERSION}-mga9 ${ORG_URL_PREFIX} java 1.1.5-mga9 - - 8071 8080 - - ${APPL_USER} ${APPL_GROUP}