Compare commits
4 Commits
tiki-1.0.1
...
tiki-1.1.0
| Author | SHA1 | Date | |
|---|---|---|---|
| d0eb0222f6 | |||
| 95f6e3ba91 | |||
| 91f7208b91 | |||
| 81c69e9e94 |
19
Dockerfile
19
Dockerfile
@@ -18,6 +18,7 @@ LABEL maintainer=${IMG_MAINTAINER}
|
|||||||
|
|
||||||
ARG HTTPD_VHOST_CONFIG_DIR=/etc/httpd/conf/sites.d/default_vhost.d
|
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
|
ARG TIKI_CORE_CONFIG_FILE=${HTTPD_VHOST_CONFIG_DIR}/70-tiki-core.conf
|
||||||
|
ARG TIKI_SHARE_DIR=/usr/share/tiki
|
||||||
ARG TIKI_WWW_DIR=/var/www/tiki
|
ARG TIKI_WWW_DIR=/var/www/tiki
|
||||||
|
|
||||||
|
|
||||||
@@ -25,7 +26,10 @@ ARG TIKI_WWW_DIR=/var/www/tiki
|
|||||||
#---------------------------------------------------------------------------------------------------
|
#---------------------------------------------------------------------------------------------------
|
||||||
ARG TIKI='#!/bin/bash \n\
|
ARG TIKI='#!/bin/bash \n\
|
||||||
\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\
|
\n\
|
||||||
chown -R apache:apache '${TIKI_WWW_DIR}' \n\
|
chown -R apache:apache '${TIKI_WWW_DIR}' \n\
|
||||||
chmod -R a-x,a+X '${TIKI_WWW_DIR}' \n\
|
chmod -R a-x,a+X '${TIKI_WWW_DIR}' \n\
|
||||||
@@ -36,12 +40,23 @@ cp -f '${TIKI_CORE_CONFIG_FILE}.ref' '${TIKI_CORE
|
|||||||
\n\
|
\n\
|
||||||
sed -i -e "s%TIKI_URL%${TIKI_URL}%g" '${TIKI_CORE_CONFIG_FILE}' \n\
|
sed -i -e "s%TIKI_URL%${TIKI_URL}%g" '${TIKI_CORE_CONFIG_FILE}' \n\
|
||||||
\n\
|
\n\
|
||||||
|
IFS=":" \n\
|
||||||
|
read -r -a file <<< "${TIKI_ROOT_LINK_LIST}" \n\
|
||||||
|
\n\
|
||||||
|
i=0 \n\
|
||||||
|
while [[ ${i} -lt ${#file[@]} ]] \n\
|
||||||
|
do \n\
|
||||||
|
ln -s '${TIKI_WWW_DIR}'/${file[${i}]} '${TIKI_SHARE_DIR}' \n\
|
||||||
|
\n\
|
||||||
|
i=$(( ${i} + 1)) \n\
|
||||||
|
done \n\
|
||||||
|
\n\
|
||||||
sed -i -e "s%mailhub=mail%mailhub=${SMTP_SERVER}%" /etc/ssmtp/ssmtp.conf'
|
sed -i -e "s%mailhub=mail%mailhub=${SMTP_SERVER}%" /etc/ssmtp/ssmtp.conf'
|
||||||
#---------------------------------------------------------------------------------------------------
|
#---------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
RUN . /etc/profile.d/rx3.sh && isl_add ${IMG_URL} \
|
RUN . /etc/profile.d/rx3.sh && isl --add ${IMG_URL} \
|
||||||
&& urpmi.update -a \
|
&& urpmi.update -a \
|
||||||
&& urpmi --force wget ssmtp tiki \
|
&& urpmi --force wget ssmtp tiki \
|
||||||
&& mv /etc/httpd/conf/sites.d/tiki.conf ${TIKI_CORE_CONFIG_FILE}.ref \
|
&& mv /etc/httpd/conf/sites.d/tiki.conf ${TIKI_CORE_CONFIG_FILE}.ref \
|
||||||
|
|||||||
@@ -5,8 +5,8 @@ Welcome to Rx3-Docker/Tiki docker image!
|
|||||||
This project aims to build a Tiki docker image.
|
This project aims to build a Tiki docker image.
|
||||||
|
|
||||||
Features:
|
Features:
|
||||||
- Curtently based on rx3-docker/php-apache:1.6.2-mga9 & rx3-docker/mariadb:1.1.5-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.4.
|
- Sync with Tiki 2.5.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,9 +1,48 @@
|
|||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
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
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
- Now use rx3-docker/php-apache:1.6.3-mga9 image.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
Rx3-Docker/Tiki V 1.0.3 - A. GIBERT - 2026/02/28
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
- Add TIKI_ROOT_LINK_LIST variable support,
|
||||||
|
- .htaccess and robots.txt are now read from /var/www/tiki dir.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
Rx3-Docker/Tiki V 1.0.2 - A. GIBERT - 2026/02/23
|
||||||
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
- Update to Tiki 2.5,
|
||||||
|
- Only overwrite empty /var/www/tiki dir,
|
||||||
|
- Now use rx3-docker/mariadb:1.1.6-mga9 image.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
------------------------------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
Rx3-Docker/Tiki V 1.0.1 - A. GIBERT - 2026/02/16
|
Rx3-Docker/Tiki V 1.0.1 - A. GIBERT - 2026/02/16
|
||||||
------------------------------------------------------------------------------------------------------------------------------------
|
------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
- Add ISL support,
|
- 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.
|
- Rebuild for updates.
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
10
compose.yaml
10
compose.yaml
@@ -68,11 +68,21 @@ services:
|
|||||||
|
|
||||||
environment:
|
environment:
|
||||||
SERVER_CROND_ENABLED: ${WA_CROND_ENABLED}
|
SERVER_CROND_ENABLED: ${WA_CROND_ENABLED}
|
||||||
|
|
||||||
APACHE_UID: ${WA_USER_ID}
|
APACHE_UID: ${WA_USER_ID}
|
||||||
APACHE_GID: ${WA_GROUP_ID}
|
APACHE_GID: ${WA_GROUP_ID}
|
||||||
APACHE_DOC_ROOT: ${WA_APACHE_DOC_ROOT}
|
APACHE_DOC_ROOT: ${WA_APACHE_DOC_ROOT}
|
||||||
|
|
||||||
PHP_UPLOAD_LIMIT: ${WA_PHP_UPLOAD_LIMIT}
|
PHP_UPLOAD_LIMIT: ${WA_PHP_UPLOAD_LIMIT}
|
||||||
|
|
||||||
TIKI_URL: ${WA_TIKI_URL}
|
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:
|
volumes:
|
||||||
- ./${WA_LOG_INIT_EXT}:${WA_LOG_INIT_INT}
|
- ./${WA_LOG_INIT_EXT}:${WA_LOG_INIT_INT}
|
||||||
|
|||||||
11
env.dist
11
env.dist
@@ -7,6 +7,7 @@
|
|||||||
|
|
||||||
ORG_NAME="rx3-docker"
|
ORG_NAME="rx3-docker"
|
||||||
ORG_REGISTRY="docker.xor.rx3:5000"
|
ORG_REGISTRY="docker.xor.rx3:5000"
|
||||||
|
ORG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
|
||||||
|
|
||||||
ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}"
|
ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}"
|
||||||
|
|
||||||
@@ -20,7 +21,7 @@ APPL_NAME="tiki"
|
|||||||
APPL_NAME_FULL="Tiki Server"
|
APPL_NAME_FULL="Tiki Server"
|
||||||
APPL_NAME_SHORT="tiki"
|
APPL_NAME_SHORT="tiki"
|
||||||
APPL_ORG="rx3-docker"
|
APPL_ORG="rx3-docker"
|
||||||
APPL_VERSION="1.0.1"
|
APPL_VERSION="1.1.0"
|
||||||
APPL_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
|
APPL_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
|
||||||
|
|
||||||
|
|
||||||
@@ -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 |
|
# | 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.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.2-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
|
# WebApp
|
||||||
#-------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
WA_CROND_ENABLED="FALSE"
|
WA_CROND_ENABLED="TRUE"
|
||||||
|
|
||||||
WA_APACHE_DOC_ROOT="/var/www/html"
|
WA_APACHE_DOC_ROOT="/var/www/html"
|
||||||
WA_PHP_UPLOAD_LIMIT="64M"
|
WA_PHP_UPLOAD_LIMIT="64M"
|
||||||
@@ -113,3 +114,5 @@ WA_WWW_INT=/var/www/${APPL_NAME}
|
|||||||
|
|
||||||
WA_TIKI_URL="/tiki/"
|
WA_TIKI_URL="/tiki/"
|
||||||
#WA_SMTP_SERVER="mail.rx3.net"
|
#WA_SMTP_SERVER="mail.rx3.net"
|
||||||
|
|
||||||
|
WA_TIKI_ROOT_LINK_LIST="ads.txt:security.txt"
|
||||||
|
|||||||
Reference in New Issue
Block a user