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

Compare commits

base: Rx3:etc-1.0.2
Branches Tags
Rx3:master
Rx3:etc-1.1.0 Rx3:etc-1.0.2 Rx3:etc-1.0.1 Rx3:etc-1.0.0
...
compare: Rx3:etc-1.1.0
Branches Tags
Rx3:master
Rx3:etc-1.1.0 Rx3:etc-1.0.2 Rx3:etc-1.0.1 Rx3:etc-1.0.0

1 Commits
etc-1.0.2 ... etc-1.1.0

Author SHA1 Message Date
Arnaud G. GIBERT
f9706c71dc - 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, 
- 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.
 2026-06-01 14:21:03 +02:00
4 changed files with 44 additions and 10 deletions
Expand all files Collapse all files

2
Dockerfile
View File

@@ -34,7 +34,7 @@ sed -i -e "${ENV_NET_SED}" '${W
RUN . /etc/profile.d/rx3.sh && isl_add ${IMG_URL} \ RUN . /etc/profile.d/rx3.sh && isl --add ${IMG_URL} \
&& echo -e "${WEB_SERVERD}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/web-serverd \ && echo -e "${WEB_SERVERD}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/web-serverd \
&& chmod a+x /etc/init.d/web-serverd \ && chmod a+x /etc/init.d/web-serverd \
&& ln -s /etc/init.d/web-serverd /etc/rcD.d/S30web-serverd && ln -s /etc/init.d/web-serverd /etc/rcD.d/S30web-serverd

17
ReleaseNotes.txt
View File

@@ -1,8 +1,21 @@
------------------------------------------------------------------------------------------------------------------------------------
Rx3/ETC V 1.1.0 - A. GIBERT - 2026/06/01
------------------------------------------------------------------------------------------------------------------------------------
- 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,
- 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.
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------
Rx3/ETC V 1.0.2 - A. GIBERT - 2026/03/01 Rx3/ETC V 1.0.2 - A. GIBERT - 2026/03/01
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------
- Use now rx3-docker/tiki:1.0.4-mga9, rx3-docker/php-apache:1.6.3-mga9 & rx3-docker/tools:1.3.1-mga9 images, - Now use rx3-docker/tiki:1.0.4-mga9, rx3-docker/php-apache:1.6.3-mga9 & rx3-docker/tools:1.3.1-mga9 images,
- Use new Proxy_Ext macro. - Use new Proxy_Ext macro.
@@ -11,7 +24,7 @@ Rx3/ETC V 1.0.2 - A. GIBERT - 2026/03/01
Rx3/ETC V 1.0.1 - A. GIBERT - 2026/02/28 Rx3/ETC V 1.0.1 - A. GIBERT - 2026/02/28
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------
- Use now rx3-docker/tiki:1.0.3-mga9 image, - Now use rx3-docker/tiki:1.0.3-mga9 image,
- Use TIKI_ROOT_LINK_LIST and add by default ads.txt & security.txt root links, - Use TIKI_ROOT_LINK_LIST and add by default ads.txt & security.txt root links,
- Fix phpMyAdmin redirection on login/logout. - Fix phpMyAdmin redirection on login/logout.

20
compose.yaml
View File

@@ -40,6 +40,12 @@ services:
ENV_NET_SED: "${ENV_NET_SED}" ENV_NET_SED: "${ENV_NET_SED}"
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:${WS_PORT_MAIN_INT}/"]
interval: 10s
timeout: 3s
retries: 3
volumes: volumes:
# - ./${WS_CONF_EXT}:${WS_CONF_INT} # - ./${WS_CONF_EXT}:${WS_CONF_INT}
# - ./${WS_LIB_EXT}:${WS_LIB_INT} # - ./${WS_LIB_EXT}:${WS_LIB_INT}
@@ -111,6 +117,8 @@ services:
condition: service_healthy condition: service_healthy
environment: environment:
SERVER_CROND_ENABLED: ${TOOLS_CROND_ENABLED}
APACHE_UID: ${TOOLS_USER_ID} APACHE_UID: ${TOOLS_USER_ID}
APACHE_GID: ${TOOLS_GROUP_ID} APACHE_GID: ${TOOLS_GROUP_ID}
APACHE_DOC_ROOT: /var/www/html APACHE_DOC_ROOT: /var/www/html
@@ -121,6 +129,12 @@ services:
TOOLS_RPC_ENABLED: ${TOOLS_RPC_ENABLED} TOOLS_RPC_ENABLED: ${TOOLS_RPC_ENABLED}
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:${TOOLS_PORT_MAIN_INT}/"]
interval: 10s
timeout: 3s
retries: 3
volumes: volumes:
- ./${TOOLS_LOG_INIT_EXT}:${TOOLS_LOG_INIT_INT} - ./${TOOLS_LOG_INIT_EXT}:${TOOLS_LOG_INIT_INT}
- ./${TOOLS_LOG_SV_EXT}:${TOOLS_LOG_SV_INT} - ./${TOOLS_LOG_SV_EXT}:${TOOLS_LOG_SV_INT}
@@ -159,6 +173,12 @@ services:
TIKI_URL: ${WA_TIKI_URL} TIKI_URL: ${WA_TIKI_URL}
TIKI_ROOT_LINK_LIST: ${WA_TIKI_ROOT_LINK_LIST} 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}
- ./${WA_LOG_SV_EXT}:${WA_LOG_SV_INT} - ./${WA_LOG_SV_EXT}:${WA_LOG_SV_INT}

15
env.dist
View File

@@ -19,7 +19,7 @@ APPL_NAME="etc"
APPL_NAME_PREFIX="rx3" APPL_NAME_PREFIX="rx3"
APPL_NAME_FULL="ETC Docker Image" APPL_NAME_FULL="ETC Docker Image"
APPL_NAME_SHORT="etc" APPL_NAME_SHORT="etc"
APPL_VERSION="1.0.2" APPL_VERSION="1.1.0"
APPL_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>' APPL_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
@@ -59,7 +59,7 @@ fi
if [[ "${APPL_ENV}" != "dvp" ]] if [[ "${APPL_ENV}" != "dvp" ]]
then then
APPL_USER="apache" APPL_USER="apache"
APPL_GROUP="entrashi" APPL_GROUP="etc"
else else
APPL_USER="davfs2" APPL_USER="davfs2"
APPL_GROUP="apache" 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 | # | 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 DB database ${ORG_URL_PREFIX} mariadb - 1.2.0-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 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
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
TOOLS_CROND_ENABLED="TRUE"
TOOLS_RPC_ENABLED="FALSE" TOOLS_RPC_ENABLED="FALSE"
@@ -139,7 +140,7 @@ TOOLS_RPC_ENABLED="FALSE"
# 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"