From dde9cf21d522007bf26f313bf2fdfe2836062ded Mon Sep 17 00:00:00 2001 From: "Arnaud G. GIBERT" Date: Mon, 23 Feb 2026 19:14:44 +0100 Subject: [PATCH] - Update to Tiki 2.5, - Only ovewrite empty /var/www/tiki dir, - Use now rx3-docker/mariadb:1.1.6-mga9 image. --- Dockerfile | 5 ++++- ReadMe.txt | 4 ++-- ReleaseNotes.txt | 10 ++++++++++ env.dist | 4 ++-- 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index d83b9b9..a48d284 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,7 +25,10 @@ ARG TIKI_WWW_DIR=/var/www/tiki #--------------------------------------------------------------------------------------------------- ARG TIKI='#!/bin/bash \n\ \n\ -cp -Rf '${TIKI_WWW_DIR}.ref/*' '${TIKI_WWW_DIR}' \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\ diff --git a/ReadMe.txt b/ReadMe.txt index 3c36778..7cb08f9 100644 --- a/ReadMe.txt +++ b/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.2-mga9 & rx3-docker/mariadb:1.1.5-mga9 images, - - Sync with Tiki 2.4. + - Curtently based on rx3-docker/php-apache:1.6.2-mga9 & rx3-docker/mariadb:1.1.6-mga9 images, + - Sync with Tiki 2.5. diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 4182e6a..b3e1617 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,13 @@ +------------------------------------------------------------------------------------------------------------------------------------ +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 ------------------------------------------------------------------------------------------------------------------------------------ diff --git a/env.dist b/env.dist index de1f3a6..4e02b97 100644 --- a/env.dist +++ b/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.1" +APPL_VERSION="1.0.2" APPL_MAINTAINER='"Arnaud G. GIBERT" ' @@ -74,7 +74,7 @@ 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.5-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.2-mga9 - - 8077 80 - - apache apache