- Update to Tiki 2.5,

- Only overwrite empty /var/www/tiki dir,
- Use now rx3-docker/mariadb:1.1.6-mga9 image.

Dockerfile

@@ -9,11 +9,12 @@ 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}
 LABEL org.rx3.${IMG_NAME}.maintainer=${IMG_MAINTAINER}
-LABEL maintainer=${IMG_MAINTAINER}ARG TIKI_VERSION=1.43.5
+LABEL maintainer=${IMG_MAINTAINER}
 
 ARG HTTPD_VHOST_CONFIG_DIR=/etc/httpd/conf/sites.d/default_vhost.d
 ARG TIKI_CORE_CONFIG_FILE=${HTTPD_VHOST_CONFIG_DIR}/70-tiki-core.conf
@@ -24,7 +25,10 @@ ARG TIKI_WWW_DIR=/var/www/tiki
 #---------------------------------------------------------------------------------------------------
 ARG TIKI='#!/bin/bash                                                                            \n\
                                                                                                  \n\
+if [[ ! -d '${TIKI_WWW_DIR}'/db ]]                                                               \n\
+then                                                                                             \n\
     cp -Rf '${TIKI_WWW_DIR}.ref/*'                                  '${TIKI_WWW_DIR}'            \n\
+fi                                                                                               \n\
                                                                                                  \n\
 chown -R apache:apache                                              '${TIKI_WWW_DIR}'            \n\
 chmod -R a-x,a+X                                                    '${TIKI_WWW_DIR}'            \n\
@@ -40,7 +44,8 @@ sed -i -e "s%mailhub=mail%mailhub=${SMTP_SERVER}%"                  /etc/ssmtp/s
 
 
 
-RUN    urpmi.update -a                                                                             \
+RUN    . /etc/profile.d/rx3.sh && isl_add ${IMG_URL}                                               \
+    && urpmi.update -a                                                                             \
     && urpmi --force wget ssmtp tiki                                                               \
     && mv         /etc/httpd/conf/sites.d/tiki.conf                   ${TIKI_CORE_CONFIG_FILE}.ref \
     && sed -i -e  "s%Alias /tiki/%Alias TIKI_URL%"                    ${TIKI_CORE_CONFIG_FILE}.ref \

ReadMe.txt

@@ -5,8 +5,8 @@ Welcome to Rx3-Docker/Tiki docker image!
 This project aims to build a Tiki docker image.
 
 Features:
-    - Curtently based on rx3-docker/php-apache:1.6.0-mga9 & rx3-docker/mariadb:1.1.4-mga9 images,
+    - Curtently based on rx3-docker/php-apache:1.6.2-mga9 & rx3-docker/mariadb:1.1.6-mga9 images,
-    - Sync with Tiki 2.4.
+    - Sync with Tiki 2.5.
 
 
 

ReleaseNotes.txt

@@ -1,3 +1,23 @@
+------------------------------------------------------------------------------------------------------------------------------------
+Rx3-Docker/Tiki V 1.0.2 - A. GIBERT - 2026/02/23
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Update to Tiki 2.5,
+- Only ovewrite empty /var/www/tiki dir,
+- Use now rx3-docker/mariadb:1.1.6-mga9 image.
+
+
+
+------------------------------------------------------------------------------------------------------------------------------------
+Rx3-Docker/Tiki V 1.0.1 - A. GIBERT - 2026/02/16
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Add ISL support,
+- Use now rx3-docker/php-apache:1.6.2-mga9 & rx3-docker/mariadb:1.1.5-mga9 images,
+- Rebuild for updates.
+
+
+
 ------------------------------------------------------------------------------------------------------------------------------------
 Rx3-Docker/Tiki V 1.0.0 - A. GIBERT - 2025/12/30
 ------------------------------------------------------------------------------------------------------------------------------------

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

env.dist

@@ -20,7 +20,7 @@ APPL_NAME="tiki"
 APPL_NAME_FULL="Tiki Server"
 APPL_NAME_SHORT="tiki"
 APPL_ORG="rx3-docker"
-APPL_VERSION="1.0.0"
+APPL_VERSION="1.0.2"
 APPL_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
 
 
@@ -74,9 +74,9 @@ DOCKER_TOOLS_VOLUME=MIXED
 #                  | 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}    mariadb            -                               1.1.4-mga9             -                    -               -            mysql          -            -       3306    -       -       mysql          mysql   
+docker_service_add   DB         database                   ${ORG_URL_PREFIX}    mariadb            -                               1.1.6-mga9             -                    -               -            mysql          -            -       3306    -       -       mysql          mysql   
 
-docker_service_add   WA         webapp                     ${ORG_URL_PREFIX}    tiki               "Rx3-Docker/Tiki"               ${APPL_VERSION}-mga9   ${ORG_URL_PREFIX}    php-apache      1.6.0-mga9   -              -            8077    80      -       -       apache         apache
+docker_service_add   WA         webapp                     ${ORG_URL_PREFIX}    tiki               "Rx3-Docker/Tiki"               ${APPL_VERSION}-mga9   ${ORG_URL_PREFIX}    php-apache      1.6.2-mga9   -              -            8077    80      -       -       apache         apache