Compare commits
3 Commits
tiki-1.0.0
...
tiki-1.0.3
| Author | SHA1 | Date | |
|---|---|---|---|
| 91f7208b91 | |||
| 81c69e9e94 | |||
| 6e15fab011 |
23
Dockerfile
23
Dockerfile
@@ -9,14 +9,16 @@ 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
|
||||
ARG TIKI_SHARE_DIR=/usr/share/tiki
|
||||
ARG TIKI_WWW_DIR=/var/www/tiki
|
||||
|
||||
|
||||
@@ -24,7 +26,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\
|
||||
@@ -35,12 +40,24 @@ cp -f '${TIKI_CORE_CONFIG_FILE}.ref' '${TIKI_CORE
|
||||
\n\
|
||||
sed -i -e "s%TIKI_URL%${TIKI_URL}%g" '${TIKI_CORE_CONFIG_FILE}' \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'
|
||||
#---------------------------------------------------------------------------------------------------
|
||||
|
||||
|
||||
|
||||
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 \
|
||||
|
||||
@@ -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,
|
||||
- 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.
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -1,3 +1,32 @@
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
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,
|
||||
- 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
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
@@ -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
|
||||
@@ -72,6 +73,7 @@ services:
|
||||
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}
|
||||
|
||||
volumes:
|
||||
- ./${WA_LOG_INIT_EXT}:${WA_LOG_INIT_INT}
|
||||
|
||||
8
env.dist
8
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.3"
|
||||
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
|
||||
|
||||
|
||||
|
||||
@@ -113,3 +113,5 @@ WA_WWW_INT=/var/www/${APPL_NAME}
|
||||
|
||||
WA_TIKI_URL="/tiki/"
|
||||
#WA_SMTP_SERVER="mail.rx3.net"
|
||||
|
||||
WA_TIKI_ROOT_LINK_LIST="ads.txt:security.txt"
|
||||
|
||||
Reference in New Issue
Block a user