diff --git a/Dockerfile b/Dockerfile index d4450f3..1bf4baf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -56,7 +56,7 @@ sed -i -e "s%mailhub=mail%mailhub=${SMTP_SERVER}%" /etc/ssmtp/s -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 ssmtp tiki \ && mv /etc/httpd/conf/sites.d/tiki.conf ${TIKI_CORE_CONFIG_FILE}.ref \ diff --git a/ReadMe.txt b/ReadMe.txt index 4e70f49..00fde3a 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -5,7 +5,7 @@ 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.3-mga9 & rx3-docker/mariadb:1.1.6-mga9 images, + - Curtently based on rx3-docker/php-apache:1.7.0-mga9 & rx3-docker/mariadb:1.2.0-mga9 images, - Sync with Tiki 2.5. diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 89f9cb3..cb96575 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,8 +1,20 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3-Docker/Tiki V 1.1.0 - A. GIBERT - 2026/05/31 +------------------------------------------------------------------------------------------------------------------------------------ + +- Now use rx3-docker/php-apache:1.7.0-mga9 & rx3-docker/postgresql:1.2.0-mga9 images, +- Now use docker-tools-1.5.2, +- Enable cron daemon to clean-up dead php sessions, +- Add healthcheck on webapp service, +- Rebuild for updates. + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3-Docker/Tiki V 1.0.4 - A. GIBERT - 2026/03/01 ------------------------------------------------------------------------------------------------------------------------------------ -- Use now rx3-docker/php-apache:1.6.3-mga9 image. +- Now use rx3-docker/php-apache:1.6.3-mga9 image. @@ -21,7 +33,7 @@ Rx3-Docker/Tiki V 1.0.2 - A. GIBERT - 2026/02/23 - Update to Tiki 2.5, - Only overwrite empty /var/www/tiki dir, -- Use now rx3-docker/mariadb:1.1.6-mga9 image. +- Now use rx3-docker/mariadb:1.1.6-mga9 image. @@ -30,7 +42,7 @@ 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, +- Now use rx3-docker/php-apache:1.6.2-mga9 & rx3-docker/mariadb:1.1.5-mga9 images, - Rebuild for updates. diff --git a/compose.yaml b/compose.yaml index 777f96b..26689d3 100644 --- a/compose.yaml +++ b/compose.yaml @@ -68,13 +68,22 @@ services: environment: SERVER_CROND_ENABLED: ${WA_CROND_ENABLED} + APACHE_UID: ${WA_USER_ID} APACHE_GID: ${WA_GROUP_ID} APACHE_DOC_ROOT: ${WA_APACHE_DOC_ROOT} + PHP_UPLOAD_LIMIT: ${WA_PHP_UPLOAD_LIMIT} + TIKI_URL: ${WA_TIKI_URL} TIKI_ROOT_LINK_LIST: ${WA_TIKI_ROOT_LINK_LIST} + healthcheck: + test: ["CMD", "curl", "-f", "http://localhost:${WA_PORT_MAIN_INT}/${WA_TIKI_URL}/"] + interval: 10s + timeout: 3s + retries: 3 + volumes: - ./${WA_LOG_INIT_EXT}:${WA_LOG_INIT_INT} - ./${WA_LOG_SV_EXT}:${WA_LOG_SV_INT} diff --git a/env.dist b/env.dist index 71578d1..ff0ae69 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="tiki" APPL_NAME_FULL="Tiki Server" APPL_NAME_SHORT="tiki" APPL_ORG="rx3-docker" -APPL_VERSION="1.0.4" +APPL_VERSION="1.1.0" APPL_MAINTAINER='"Arnaud G. GIBERT" ' @@ -74,9 +75,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.6-mga9 - - - mysql - - 3306 - - mysql mysql +docker_service_add DB database ${ORG_URL_PREFIX} mariadb - 1.2.0-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.3-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.7.0-mga9 - - 8077 80 - - apache apache @@ -98,7 +99,7 @@ DB_SERVER_NAME="Tiki" # WebApp #------------------------------------------------------------------------------- -WA_CROND_ENABLED="FALSE" +WA_CROND_ENABLED="TRUE" WA_APACHE_DOC_ROOT="/var/www/html" WA_PHP_UPLOAD_LIMIT="64M"