diff --git a/Dockerfile b/Dockerfile index 60cc91e..47191a0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,7 +48,7 @@ command='${SQUASHTM_STARTUP} -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 wget \ && mkdir /opt/appl \ diff --git a/ReadMe.txt b/ReadMe.txt index c1a52df..457b921 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.5-mga9 & rx3-docker/postgresql:1.1.6-mga9 images, + - Curtently based on rx3-docker/java-1.2.0-mga9 & rx3-docker/postgresql:1.2.0-mga9 images, - Sync with SquashTM 9.0.0. diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index bc8cace..5f62d34 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,9 +1,19 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3-Docker/SquashTM V 1.1.0 - A. GIBERT - 2026/05/31 +------------------------------------------------------------------------------------------------------------------------------------ + +- Now use rx3-docker/java:1.2.0-mga9 & rx3-docker/postgresql:1.2.0-mga9 images, +- Now use docker-tools-1.5.2, +- Rebuild for updates. + + + ------------------------------------------------------------------------------------------------------------------------------------ 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, +- Now use rx3-docker/java:1.1.5-mga9 & rx3-docker/postgresql:1.1.6-mga9 images, - Rebuild for updates. diff --git a/env.dist b/env.dist index d5b781e..dddf507 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="squash-tm" APPL_NAME_FULL="Squash Test Manager" APPL_NAME_SHORT="squashtm" APPL_ORG="rx3-docker" -APPL_VERSION="1.0.4" +APPL_VERSION="1.1.0" APPL_MAINTAINER='"Arnaud G. GIBERT" ' @@ -77,9 +78,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.6-mga9 - - - postgres - - 5432 - - postgres postgres +docker_service_add DB database ${ORG_URL_PREFIX} postgresql - 1.2.0-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.5-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.2.0-mga9 - - 8071 8080 - - ${APPL_USER} ${APPL_GROUP}