- Initial release,

- Based on rx3-docker/php-apache:1.7.3-mga9,
- Use DAViCal 1.1.13 from Rx3 RPM.
This commit is contained in:
AlkorZ3 committed 2026-11-16 20:38:39 +01:00
commit 3a8fc97195
7 files changed
+367

No files matched your search

+2
View File
@@ -0,0 +1,2 @@
*~
*.old
+101
View File
@@ -0,0 +1,101 @@
# Rx3-Docker/MediaWiki Dockerfile
#-------------------------------------------------------------------------------
ARG IMG_FROM_URL="rx3-docker/php-apache:latest"
FROM ${IMG_FROM_URL}
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 HTTPD_VHOST_CONFIG_DIR=/etc/httpd/conf/sites.d/default_vhost.d
ARG DAVICAL_HTTPD_CONFIG_FILE=${HTTPD_VHOST_CONFIG_DIR}/70-davical.conf
ARG DAVICAL_CONFIG_DIR=/etc/davical
ARG DAVICAL_CONFIG_FILE=${DAVICAL_CONFIG_DIR}/config.php
ARG DAVICAL_POSTGRES_USER=postgres
#----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
ARG DAVICAL='#!/bin/bash \n\
\n\
export PGHOST=${DAVICAL_DB_HOST} \n\
export PGPORT=${DAVICAL_DB_PORT} \n\
export PGUSER='${DAVICAL_POSTGRES_USER}' \n\
export PGPASSWORD=${DAVICAL_DB_POSTGRES_PASSWORD} \n\
export UDDB_ARG="--dbname ${DAVICAL_DB_NAME} --dbuser '${DAVICAL_POSTGRES_USER}' --appuser ${DAVICAL_DB_USER} --owner '${DAVICAL_POSTGRES_USER}'" \n\
\n\
\n\
cp -f '${DAVICAL_HTTPD_CONFIG_FILE}.ref' '${DAVICAL_HTTPD_CONFIG_FILE}' \n\
sed -i -e "s%DAVICAL_URL%${DAVICAL_URL}%g" '${DAVICAL_HTTPD_CONFIG_FILE}' \n\
\n\
if [[ ! -f '${DAVICAL_CONFIG_FILE}' ]] \n\
then \n\
cp -R '${DAVICAL_CONFIG_DIR}'.ref/* '${DAVICAL_CONFIG_DIR}' \n\
\n\
psql -qXAt -f /usr/share/php/awl/dba/awl-tables.sql ${DAVICAL_DB_NAME} \n\
psql -qXAt -f /usr/share/php/awl/dba/schema-management.sql ${DAVICAL_DB_NAME} \n\
psql -qXAt -f /usr/share/davical/dba/davical.sql ${DAVICAL_DB_NAME} \n\
/usr/share/davical/dba/update-davical-database --nopatch ${UDDB_ARG} \n\
psql -qXAt -f /usr/share/davical/dba/base-data.sql ${DAVICAL_DB_NAME} \n\
psql -qX -c "UPDATE usr SET password = `**${DAVICAL_ADMIN_PASSWORD}` WHERE user_no = 1;" ${DAVICAL_DB_NAME} \n\
fi \n\
\n\
/usr/share/davical/dba/update-davical-database ${UDDB_ARG} \n\
\n\
chown -R apache:apache '${DAVICAL_CONFIG_DIR}' \n\
chmod -R a-x,a+X '${DAVICAL_CONFIG_DIR}' \n\
chmod o-rwx '${DAVICAL_CONFIG_DIR}' \n\
\n\
sed -i -e "s/DB_HOST/${DAVICAL_DB_HOST}/" '${DAVICAL_CONFIG_FILE}' \n\
sed -i -e "s/DB_PORT/${DAVICAL_DB_PORT}/" '${DAVICAL_CONFIG_FILE}' \n\
sed -i -e "s/DB_NAME/${DAVICAL_DB_NAME}/" '${DAVICAL_CONFIG_FILE}' \n\
sed -i -e "s/DB_USER/${DAVICAL_DB_USER}/" '${DAVICAL_CONFIG_FILE}' \n\
sed -i -e "s/DB_PASSWORD/${DAVICAL_DB_PASSWORD}/" '${DAVICAL_CONFIG_FILE}' \n\
\n\
sed -i -e "s%ORG_NAME%${DAVICAL_ORG_NAME}%" '${DAVICAL_CONFIG_FILE}' \n\
sed -i -e "s%SERVER_NAME%${DAVICAL_SERVER_NAME}%" '${DAVICAL_CONFIG_FILE}' \n\
sed -i -e "s/ADMIN_EMAIL/${DAVICAL_ADMIN_EMAIL}/" '${DAVICAL_CONFIG_FILE}' \n\
'
#----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
RUN . /etc/profile.d/rx3.sh && isl --add ${IMG_URL} \
&& urpmi.update -a \
&& urpmi --force davical postgresql15 php-calendar php-curl \
&& mv /etc/httpd/conf.d/davical.conf "${DAVICAL_HTTPD_CONFIG_FILE}.ref" \
&& sed -i -e "s%Alias /davical%Alias DAVICAL_URL%" "${DAVICAL_HTTPD_CONFIG_FILE}.ref" \
&& sed -i -e "s%/htdocs$%/htdocs/%" "${DAVICAL_HTTPD_CONFIG_FILE}.ref" \
&& sed -i -e "s%^ RewriteRule % #RewriteRule %" "${DAVICAL_HTTPD_CONFIG_FILE}.ref" \
&& sed -i -e "s/^\$c->pg_connect\[\] = .*/\$c->pg_connect[] = 'host=DB_HOST port=DB_PORT dbname=DB_NAME user=DB_USER password=DB_PASSWORD';/" "${DAVICAL_CONFIG_FILE}" \
&& sed -i -e "s%^// \$c->system_name = .*%\$c->system_name = 'SERVER_NAME';%" "${DAVICAL_CONFIG_FILE}" \
&& sed -i -e "s/^\$c->admin_email = .*/\$c->admin_email = 'ADMIN_EMAIL';/" "${DAVICAL_CONFIG_FILE}" \
&& sed -i -e "s%^// \$c->restrict_setup_to_admin = %\$c->restrict_setup_to_admin = %" "${DAVICAL_CONFIG_FILE}" \
&& sed -i -e "s%^// \$c->default_collections = %DEFAULT_COLLECTIONS\n// \$c->default_collections = %" "${DAVICAL_CONFIG_FILE}" \
&& sed -i -e "s/DEFAULT_COLLECTIONS/\$c->default_collections=array(\nDEFAULT_COLLECTIONS/" "${DAVICAL_CONFIG_FILE}" \
&& sed -i -e "s/DEFAULT_COLLECTIONS/array('type'=>'addressbook', 'name'=>'addressbook', DEFAULT_COLLECTIONS/" "${DAVICAL_CONFIG_FILE}" \
&& sed -i -e "s/DEFAULT_COLLECTIONS/'displayname'=>'ORG_NAME %fn Addressbook', 'privileges'=>null),\nDEFAULT_COLLECTIONS/" "${DAVICAL_CONFIG_FILE}" \
&& sed -i -e "s/DEFAULT_COLLECTIONS/array('type'=>'calendar', 'name'=>'calendar', DEFAULT_COLLECTIONS/" "${DAVICAL_CONFIG_FILE}" \
&& sed -i -e "s/DEFAULT_COLLECTIONS/'displayname'=>'ORG_NAME %fn Calendar', 'privileges'=>null)\nDEFAULT_COLLECTIONS/" "${DAVICAL_CONFIG_FILE}" \
&& sed -i -e "s/DEFAULT_COLLECTIONS/);\n/" "${DAVICAL_CONFIG_FILE}" \
&& sed -i -e "s%^// \$c->authenticate_hook\['server_auth_type'\] = %\$c->authenticate_hook['server_auth_type'] = %" "${DAVICAL_CONFIG_FILE}" \
&& sed -i -e "s%^// include_once('AuthPlugins.php');%include_once('AuthPlugins.php');%" "${DAVICAL_CONFIG_FILE}" \
&& mv "${DAVICAL_CONFIG_DIR}" "${DAVICAL_CONFIG_DIR}.ref" \
&& echo -e "${DAVICAL}" | sed -e "s/\`/'/g" -e 's/ *$//' > "/etc/init.d/davical" \
&& chmod a+x /etc/init.d/davical \
&& ln -s /etc/init.d/davical /etc/rcD.d/S40davical
# && echo -e "${MEDIAWIKI_SURL_CONFIG}" | sed -e "s/\`/'/g" -e 's/ *$//' > ${MEDIAWIKI_SURL_CONFIG_FILE}.ref \
# && sed -i -e "s/^\$c->pg_connect[] = .*/$c->pg_connect[] = 'host=DB_HOST port=DB_PORT dbname=DB_NAME user=DB_USER password=DB_PASSWORD';/" "${DAVICAL_HTTPD_CONFIG_FILE}" \
#/usr/share/davical/dba/create-database.sh ${DAVICAL_DB_NAME} ${DAVICAL_DB_POSTGRES_PASSWORD} postgres ${DAVICAL_DB_USER} \n\
+20
View File
@@ -0,0 +1,20 @@
Welcome to Rx3-Docker/DAViCal docker image!
This project aims to build a DAViCal docker image.
Features:
- Currently based on rx3-docker/php-apache:1.7.3-mga9,
- Sync with DAViCal Rx3 RPM 1.1.13,
- HTTP proxy authentication enabled.
Enjoy it!
Your Rx3 Team.
--
arnaud@rx3.net
https://git.rx3.org/gitea/rx3-docker/davical
+7
View File
@@ -0,0 +1,7 @@
------------------------------------------------------------------------------------------------------------------------------------
Rx3-Docker/DAViCal V 1.0.0 - A. GIBERT - 2026/11/16
------------------------------------------------------------------------------------------------------------------------------------
- Initial release,
- Based on rx3-docker/php-apache:1.7.3-mga9,
- Use DAViCal 1.1.13 from Rx3 RPM.
+114
View File
@@ -0,0 +1,114 @@
# Rx3-Docker/DAViCal Docker Image
#-------------------------------------------------------------------------------
name: ${HOST_NAME_PREFIX}
services:
database:
container_name: ${DB_HOST_NAME}
hostname: ${DB_HOST_NAME}
image: ${DB_IMG_URL}
restart: unless-stopped
environment:
POSTGRESQL_UID: ${DB_USER_ID}
POSTGRESQL_GID: ${DB_GROUP_ID}
POSTGRESQL_POSTGRES_PASSWORD: ${DB_POSTGRES_PASSWORD}
POSTGRESQL_DATABASE: ${DB_NAME}
POSTGRESQL_USER: ${DB_USER}
POSTGRESQL_PASSWORD: ${DB_PASSWORD}
healthcheck:
test: ["CMD-SHELL", "sh -c 'pg_isready -U ${DB_USER} -d ${DB_NAME}'"]
interval: 10s
timeout: 3s
retries: 3
volumes:
- ./${DB_LIB_EXT}:${DB_LIB_INT}
- ./${DB_LOG_INIT_EXT}:${DB_LOG_INIT_INT}
- ./${DB_LOG_SV_EXT}:${DB_LOG_SV_INT}
- ./${DB_LOG_MAIN_EXT}:${DB_LOG_MAIN_INT}
networks:
- appl
# ports:
# - "127.0.0.1:${DB_PORT_SV_EXT}:${DB_PORT_SV_INT}"
# - "127.0.0.1:${DB_PORT_MAIN_EXT}:${DB_PORT_MAIN_INT}"
#-------------------------------------------------------------------------------
webapp:
container_name: ${WA_HOST_NAME}
hostname: ${WA_HOST_NAME}
image: ${WA_IMG_URL}
build:
context: .
args:
IMG_NAME: ${WA_IMG_URL}
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
depends_on:
database:
condition: service_healthy
environment:
SERVER_CROND_ENABLED: ${WA_CROND_ENABLED}
APACHE_UID: ${WA_USER_ID}
APACHE_GID: ${WA_GROUP_ID}
APACHE_DOC_ROOT: ${WA_APACHE_DOC_ROOT}
PHP_UPLOAD_LIMIT: ${WA_PHP_UPLOAD_LIMIT}
DAVICAL_DB_HOST: ${DB_HOST_NAME}
DAVICAL_DB_PORT: ${DB_PORT_MAIN_INT}
DAVICAL_DB_POSTGRES_PASSWORD: ${DB_POSTGRES_PASSWORD}
DAVICAL_DB_NAME: ${DB_NAME}
DAVICAL_DB_USER: ${DB_USER}
DAVICAL_DB_PASSWORD: ${DB_PASSWORD}
DAVICAL_ORG_NAME: ${WA_DAVICAL_ORG_NAME}
DAVICAL_SERVER_NAME: ${WA_DAVICAL_SERVER_NAME}
DAVICAL_ADMIN_PASSWORD: ${WA_DAVICAL_ADMIN_PASSWORD}
DAVICAL_ADMIN_EMAIL: ${WA_DAVICAL_ADMIN_EMAIL}
DAVICAL_URL: ${WA_DAVICAL_URL}
volumes:
- ./${WA_LOG_INIT_EXT}:${WA_LOG_INIT_INT}
- ./${WA_LOG_SV_EXT}:${WA_LOG_SV_INT}
- ./${WA_LOG_HTTPD_EXT}:${WA_LOG_HTTPD_INT}
- ./${WA_CONF_EXT}:${WA_CONF_INT}
networks:
- appl
# - internal
ports:
- "127.0.0.1:${WA_PORT_SV_EXT}:${WA_PORT_SV_INT}"
- "127.0.0.1:${WA_PORT_MAIN_EXT}:${WA_PORT_MAIN_INT}"
networks:
appl:
name: ${NETWORK_NAME}
driver: bridge
driver_opts:
com.docker.network.bridge.name: ${NETWORK_IF_NAME}
# ipam:
# config:
# - subnet: 10.2.33.0/24
# gateway: 10.2.33.254
# internal:
# name: mantisbt-squashtm-internal
# external: true
+119
View File
@@ -0,0 +1,119 @@
# Rx3-Docker/DAViCal Docker Image
#-------------------------------------------------------------------------------
#-------------------------------------------------------------------------------
# Global Settings
#-------------------------------------------------------------------------------
ORG_NAME="rx3-docker"
ORG_REGISTRY="docker.xor.rx3:5000"
ORG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}"
#-------------------------------------------------------------------------------
# Image Settings
#-------------------------------------------------------------------------------
APPL_NAME="davical"
APPL_NAME_FULL="DAViCal Server"
APPL_NAME_SHORT="davical"
APPL_ORG="rx3-docker"
APPL_VERSION="1.0.0"
APPL_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
#-------------------------------------------------------------------------------
# User Settings
#-------------------------------------------------------------------------------
#APPL_ENV="prd"
#APPL_ENV="tst"
#APPL_ENV="int"
APPL_ENV="dvp"
#-------------------------------------------------------------------------------
# Common
#-------------------------------------------------------------------------------
if [[ "${APPL_ENV}" != "prd" ]]
then
APPL_SUFFIX="-${APPL_ENV}"
PORT_ENV_OFFSET=100
else
APPL_SUFFIX=""
PORT_ENV_OFFSET=0
fi
ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}"
APPL_URL_PREFIX="${ORG_REGISTRY}/${APPL_ORG}/${APPL_NAME_SHORT}"
HOST_NAME_PREFIX=${APPL_NAME_SHORT}${APPL_SUFFIX}
#PORT_ENV_OFFSET=0
PORT_SV_INT=9001
PORT_SV_OFFSET=1000
NETWORK_NAME=${HOST_NAME_PREFIX}
NETWORK_IF_NAME=br-${HOST_NAME_PREFIX}
DOCKER_TOOLS_DEBUG=FALSE
DOCKER_TOOLS_VOLUME=MIXED
#DOCKER_TOOLS_VOLUME=MERGED
DOCKER_TOOLS_EXEPTION_LIBS="postgres:pgsql"
#------------------+----------+--------------------------+--------------------+------------------+-------------------------------+----------------------+--------------------+---------------+------------+--------------+------------+-------+-------+-------+-------+--------------+--------------+
# | Variable | Service | Target Image | From Image | Module | Main Port | Admin Port | User | Group |
# | 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} postgresql - 1.2.1-mga9 - - - postgres - - 5432 - - postgres postgres
docker_service_add WA webapp ${ORG_URL_PREFIX} ${APPL_NAME} "Rx3-Docker/DAViCal" ${APPL_VERSION}-mga9 ${ORG_URL_PREFIX} php-apache 1.7.3-mga9 - - 8084 80 - - apache apache
#-------------------------------------------------------------------------------
# Database
#-------------------------------------------------------------------------------
DB_POSTGRES_PASSWORD="postgresadmin"
DB_NAME="davical"
DB_USER="davical"
DB_PASSWORD="davicaladmin"
DB_SERVER_NAME="DAViCal"
#-------------------------------------------------------------------------------
# WebApp
#-------------------------------------------------------------------------------
WA_CROND_ENABLED="TRUE"
WA_APACHE_DOC_ROOT="/var/www/html"
WA_PHP_UPLOAD_LIMIT="64M"
WA_LOG_HTTPD_EXT="./var/log/httpd-webapp"
WA_LOG_HTTPD_INT="/var/log/httpd"
WA_CONF_EXT=./etc/${APPL_NAME}
WA_CONF_INT=/etc/${APPL_NAME}
#docker_config_add ${WA_CONF_EXT}/config_inc.php ${WA_CONF_EXT}/config_inc.php.ref
WA_DAVICAL_ORG_NAME="Rx3"
WA_DAVICAL_SERVER_NAME="Rx3/Docker DAViCal Caldav Server"
WA_DAVICAL_URL="/davical"
WA_DAVICAL_ADMIN_PASSWORD=davicaladmin
WA_DAVICAL_ADMIN_EMAIL="pimmaster@rx3.net"
+4
View File
@@ -0,0 +1,4 @@
# Ignore everything in this directory
*
# Except this file
!.gitignore