- Update to Tiki 2.5,

- Only overwrite empty /var/www/tiki dir,
- Use now rx3-docker/mariadb:1.1.6-mga9 image.
This commit is contained in:
2026-02-23 19:14:44 +01:00
parent 6e15fab011
commit 81c69e9e94
4 changed files with 18 additions and 5 deletions

View File

@@ -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\

View File

@@ -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.

View File

@@ -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
------------------------------------------------------------------------------------------------------------------------------------

View File

@@ -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" <arnaud@rx3.net>'
@@ -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