Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f9706c71dc | |||
| edb0fe978c | |||
| 0f27028043 |
@@ -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 \
|
||||
&& chmod a+x /etc/init.d/web-serverd \
|
||||
&& ln -s /etc/init.d/web-serverd /etc/rcD.d/S30web-serverd
|
||||
|
||||
@@ -1,3 +1,35 @@
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
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
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
- 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.
|
||||
|
||||
|
||||
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
Rx3/ETC V 1.0.1 - A. GIBERT - 2026/02/28
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
- 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,
|
||||
- Fix phpMyAdmin redirection on login/logout.
|
||||
|
||||
|
||||
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
Rx3/ETC V 1.0.0 - A. GIBERT - 2026/02/27
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
21
compose.yaml
21
compose.yaml
@@ -40,6 +40,12 @@ services:
|
||||
|
||||
ENV_NET_SED: "${ENV_NET_SED}"
|
||||
|
||||
healthcheck:
|
||||
test: ["CMD", "curl", "-f", "http://localhost:${WS_PORT_MAIN_INT}/"]
|
||||
interval: 10s
|
||||
timeout: 3s
|
||||
retries: 3
|
||||
|
||||
volumes:
|
||||
# - ./${WS_CONF_EXT}:${WS_CONF_INT}
|
||||
# - ./${WS_LIB_EXT}:${WS_LIB_INT}
|
||||
@@ -111,6 +117,8 @@ services:
|
||||
condition: service_healthy
|
||||
|
||||
environment:
|
||||
SERVER_CROND_ENABLED: ${TOOLS_CROND_ENABLED}
|
||||
|
||||
APACHE_UID: ${TOOLS_USER_ID}
|
||||
APACHE_GID: ${TOOLS_GROUP_ID}
|
||||
APACHE_DOC_ROOT: /var/www/html
|
||||
@@ -121,6 +129,12 @@ services:
|
||||
|
||||
TOOLS_RPC_ENABLED: ${TOOLS_RPC_ENABLED}
|
||||
|
||||
healthcheck:
|
||||
test: ["CMD", "curl", "-f", "http://localhost:${TOOLS_PORT_MAIN_INT}/"]
|
||||
interval: 10s
|
||||
timeout: 3s
|
||||
retries: 3
|
||||
|
||||
volumes:
|
||||
- ./${TOOLS_LOG_INIT_EXT}:${TOOLS_LOG_INIT_INT}
|
||||
- ./${TOOLS_LOG_SV_EXT}:${TOOLS_LOG_SV_INT}
|
||||
@@ -157,6 +171,13 @@ 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}
|
||||
|
||||
healthcheck:
|
||||
test: ["CMD", "curl", "-f", "http://localhost:${WA_PORT_MAIN_INT}/${WA_TIKI_URL}/"]
|
||||
interval: 10s
|
||||
timeout: 3s
|
||||
retries: 3
|
||||
|
||||
volumes:
|
||||
- ./${WA_LOG_INIT_EXT}:${WA_LOG_INIT_INT}
|
||||
|
||||
28
env.dist
28
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.1.0"
|
||||
APPL_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
|
||||
|
||||
|
||||
@@ -43,7 +43,13 @@ if [[ "${APPL_ENV}" != "prd" ]]
|
||||
then
|
||||
APPL_SUFFIX="-${APPL_ENV}"
|
||||
PORT_ENV_OFFSET=100
|
||||
DOCKER_TOOLS_USER_GROUP_FORCE=TRUE
|
||||
|
||||
if [[ "${APPL_ENV}" == "tst" ]]
|
||||
then
|
||||
DOCKER_TOOLS_USER_GROUP_FORCE=FALSE
|
||||
else
|
||||
DOCKER_TOOLS_USER_GROUP_FORCE=TRUE
|
||||
fi
|
||||
else
|
||||
APPL_SUFFIX=""
|
||||
PORT_ENV_OFFSET=0
|
||||
@@ -53,11 +59,12 @@ fi
|
||||
if [[ "${APPL_ENV}" != "dvp" ]]
|
||||
then
|
||||
APPL_USER="apache"
|
||||
APPL_GROUP="etc"
|
||||
else
|
||||
APPL_USER="davfs2"
|
||||
APPL_GROUP="apache"
|
||||
fi
|
||||
|
||||
APPL_GROUP="apache"
|
||||
|
||||
ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}"
|
||||
APPL_URL_PREFIX="${ORG_REGISTRY}/${APPL_NAME_PREFIX}/${APPL_NAME_SHORT}"
|
||||
@@ -84,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.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.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.0-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.2-mga9 - - - - - - 80 - - apache apache
|
||||
docker_service_add WA webapp ${ORG_URL_PREFIX} tiki - 1.1.0-mga9 - - - - - - 80 - - apache ${APPL_GROUP}
|
||||
|
||||
|
||||
|
||||
@@ -116,7 +123,7 @@ DB_DB_NAME="tiki"
|
||||
DB_DB_USER="tiki"
|
||||
DB_DB_PASSWORD="tikiadmin"
|
||||
|
||||
DB_SERVER_NAME="Tiki"
|
||||
DB_SERVER_NAME="ETC Tiki"
|
||||
|
||||
|
||||
|
||||
@@ -124,6 +131,7 @@ DB_SERVER_NAME="Tiki"
|
||||
# Tools
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
TOOLS_CROND_ENABLED="TRUE"
|
||||
TOOLS_RPC_ENABLED="FALSE"
|
||||
|
||||
|
||||
@@ -132,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"
|
||||
@@ -146,4 +154,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"
|
||||
|
||||
@@ -1,32 +1,15 @@
|
||||
# Reverse Proxy Configuration
|
||||
ProxyRequests Off
|
||||
ProxyPreserveHost On
|
||||
|
||||
AllowEncodedSlashes NoDecode
|
||||
|
||||
|
||||
|
||||
#-------------------------------------------------------------------------------------------------------------------
|
||||
# ETC Private
|
||||
#-------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
Use SupervisorProxy private/web-server-sv ${WS_HOST_NAME} ${WS_PORT_SV_INT}
|
||||
Use SupervisorProxy private/database-sv ${DB_HOST_NAME} ${DB_PORT_SV_INT}
|
||||
Use SupervisorProxy private/tools-sv ${TOOLS_HOST_NAME} ${TOOLS_PORT_SV_INT}
|
||||
Use SupervisorProxy private/webapp-sv ${WA_HOST_NAME} ${WA_PORT_SV_INT}
|
||||
# Supervisors
|
||||
Use Proxy_Ext private/web-server-sv ${WS_HOST_NAME} ${WS_PORT_SV_INT}
|
||||
Use Proxy_Ext private/database-sv ${DB_HOST_NAME} ${DB_PORT_SV_INT}
|
||||
Use Proxy_Ext private/tools-sv ${TOOLS_HOST_NAME} ${TOOLS_PORT_SV_INT}
|
||||
Use Proxy_Ext private/webapp-sv ${WA_HOST_NAME} ${WA_PORT_SV_INT}
|
||||
|
||||
|
||||
|
||||
RewriteRule "^/private/tools$" "/private/tools/" [R]
|
||||
|
||||
<Location /private/tools/>
|
||||
ProxyPass http://${TOOLS_HOST_NAME}:${TOOLS_PORT_MAIN_INT}/ flushpackets=on
|
||||
ProxyPassReverse http://${TOOLS_HOST_NAME}:${TOOLS_PORT_MAIN_INT}/
|
||||
|
||||
ProxyPassReverseCookiePath / /private/tools/
|
||||
|
||||
RequestHeader setifempty X-Forwarded-Proto expr=%{REQUEST_SCHEME}
|
||||
</Location>
|
||||
# Tools
|
||||
Use Proxy_Ext private/tools ${TOOLS_HOST_NAME} ${TOOLS_PORT_MAIN_INT}
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user