Rx3/etc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

- Now use rx3-docker/php-apache:1.7.0-mga9, rx3-docker/mariadb:1.2.0-mga9 & rx3-docker/tools:1.4.0-mga9 images,

Browse Source 
- Now use docker-tools-1.5.2,
- Enable cron daemon to clean-up dead php sessions,
- Update APPL_GROUP name to "etc",
- Add healcheck to web-server, tools & webapp services,
- Rebuild for updates.
This commit is contained in:
Arnaud G. GIBERT
2026-06-01 00:24:11 +02:00
parent edb0fe978c
commit f9706c71dc
4 changed files with 44 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
env.dist
View File

@@ -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.2"
APPL_VERSION="1.1.0"
APPL_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
@@ -59,7 +59,7 @@ fi
if [[ "${APPL_ENV}" != "dvp" ]]
then
APPL_USER="apache"
APPL_GROUP="entrashi"
APPL_GROUP="etc"
else
APPL_USER="davfs2"
APPL_GROUP="apache"
@@ -91,12 +91,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.2-mga9 ${ORG_URL_PREFIX} php-apache 1.6.3-mga9 - - 8068 80 - - ${APPL_USER} ${APPL_GROUP}
docker_service_add WS web-server ${APPL_URL_PREFIX} - "ETC Web Server" 1.1.0-mga9 ${ORG_URL_PREFIX} php-apache 1.7.0-mga9 - - 8077 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.1-mga9 - - - httpd - - 80 - 8080 ${APPL_USER} ${APPL_GROUP}
docker_service_add DB database ${ORG_URL_PREFIX} mariadb - 1.2.0-mga9 - - - mysql - - 3306 - - mysql mysql
docker_service_add TOOLS tools ${ORG_URL_PREFIX} tools - 1.4.0-mga9 - - - httpd - - 80 - 8080 ${APPL_USER} ${APPL_GROUP}
docker_service_add WA webapp ${ORG_URL_PREFIX} tiki - 1.0.4-mga9 - - - - - - 80 - - apache ${APPL_GROUP}
docker_service_add WA webapp ${ORG_URL_PREFIX} tiki - 1.1.0-mga9 - - - - - - 80 - - apache ${APPL_GROUP}
@@ -131,6 +131,7 @@ DB_SERVER_NAME="ETC Tiki"
# Tools
#-------------------------------------------------------------------------------
TOOLS_CROND_ENABLED="TRUE"
TOOLS_RPC_ENABLED="FALSE"
@@ -139,7 +140,7 @@ TOOLS_RPC_ENABLED="FALSE"
# WebApp
#-------------------------------------------------------------------------------
WA_CROND_ENABLED="FALSE"
WA_CROND_ENABLED="TRUE"
WA_APACHE_DOC_ROOT="/var/www/html"
WA_PHP_UPLOAD_LIMIT="64M"