- Use now rx3-docker/tiki:1.0.3-mga9,
- Use TIKI_ROOT_LINK_LIST and add by default ads.txt & security.txt root links, - Fix phpMyAdmin redirection on login/logout.
This commit is contained in:
8
env.dist
8
env.dist
@@ -19,7 +19,7 @@ APPL_NAME="etc"
|
||||
APPL_NAME_PREFIX="rx3"
|
||||
APPL_NAME_FULL="ETC Docker Image"
|
||||
APPL_NAME_SHORT="etc"
|
||||
APPL_VERSION="1.0.0"
|
||||
APPL_VERSION="1.0.1"
|
||||
APPL_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
|
||||
|
||||
|
||||
@@ -84,12 +84,12 @@ DOCKER_TOOLS_VOLUME=SPLITED
|
||||
# | 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 WS web-server ${APPL_URL_PREFIX} - "ETC Web Server" 1.0.0-mga9 ${ORG_URL_PREFIX} php-apache 1.6.2-mga9 - - 8068 80 - - ${APPL_USER} ${APPL_GROUP}
|
||||
docker_service_add WS web-server ${APPL_URL_PREFIX} - "ETC Web Server" 1.0.1-mga9 ${ORG_URL_PREFIX} php-apache 1.6.2-mga9 - - 8068 80 - - ${APPL_USER} ${APPL_GROUP}
|
||||
|
||||
docker_service_add DB database ${ORG_URL_PREFIX} mariadb - 1.1.6-mga9 - - - mysql - - 3306 - - mysql mysql
|
||||
docker_service_add TOOLS tools ${ORG_URL_PREFIX} tools - 1.3.0-mga9 - - - httpd - - 80 - 8080 ${APPL_USER} ${APPL_GROUP}
|
||||
|
||||
docker_service_add WA webapp ${ORG_URL_PREFIX} tiki - 1.0.2-mga9 - - - - - - 80 - - apache apache
|
||||
docker_service_add WA webapp ${ORG_URL_PREFIX} tiki - 1.0.3-mga9 - - - - - - 80 - - apache apache
|
||||
|
||||
|
||||
|
||||
@@ -146,4 +146,6 @@ WA_WWW_EXT="./mnt/webapp${WA_WWW_INT}"
|
||||
#docker_config_add ${WA_CONF_EXT}/config_inc.php ${WA_CONF_EXT}/config_inc.php.ref
|
||||
|
||||
WA_TIKI_URL="/"
|
||||
WA_TIKI_ROOT_LINK_LIST="ads.txt:security.txt"
|
||||
|
||||
#WA_SMTP_SERVER="mail.rx3.net"
|
||||
|
||||
Reference in New Issue
Block a user