diff --git a/Dockerfile b/Dockerfile index b830f06..4d1c842 100644 --- a/Dockerfile +++ b/Dockerfile @@ -58,6 +58,8 @@ chown -R apache:apache chmod -R a-x,a+X '${RCM_LIB_DIR}' '${RCM_CONFIG_DIR}' '${RCM_LOG_DIR}' \n\ chmod o-rwx '${RCM_LIB_DIR}' '${RCM_CONFIG_DIR}' '${RCM_LOG_DIR}' \n\ \n\ +getent group poppassd >/dev/null || groupadd -g $(stat -c '%g' /var/run/poppassd/poppassd.sock) -U apache poppassd \n\ + \n\ cp -f '${RCM_HTTPD_CONFIG_FILE}.ref' '${RCM_HTTPD_CONFIG_FILE}' \n\ \n\ sed -i -e "s%RCM_URL%${RCM_URL}%g" '${RCM_HTTPD_CONFIG_FILE}' \n\ @@ -126,6 +128,9 @@ RUN . /etc/profile.d/rx3.sh && isl --add ${IMG_URL} && sed -i -e "/^[^#/]*'calendar_caldav_url'/ s|^|// |" "${RCM_CONFIG_DIR}/calendar.inc.php" \ && sed -i -e "s%// default calendar view%// RCM_CALDAV_SHARED\n\n// default calendar view%" "${RCM_CONFIG_DIR}/calendar.inc.php" \ && sed -i -e "/'calendar_first_day'/ s|= .*|= 1;|" "${RCM_CONFIG_DIR}/calendar.inc.php" \ + && sed -i -e "/'password_driver'/ s|= .*|= 'poppassd_unix';|" "${RCM_CONFIG_DIR}/password.inc.php" \ + && echo -e "\n// POPPassD_Unix driver option\n// ---------------------------" >> "${RCM_CONFIG_DIR}/password.inc.php" \ + && echo "\$config['password_poppassd_unix_socket'] = '/run/poppassd/poppassd.sock';" >> "${RCM_CONFIG_DIR}/password.inc.php" \ && mv "${RCM_CONFIG_DIR}" "${RCM_CONFIG_DIR}.ref" \ && echo -e "${ROUNDCUBEMAIL}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/roundcubemail \ && chmod a+x /etc/init.d/roundcubemail \ diff --git a/ReadMe.txt b/ReadMe.txt index 68c631d..beaa457 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -5,13 +5,14 @@ Welcome to Rx3-Docker/RoundCubeMail docker image! This project aims to build a RoundCubeMail docker image. Features: - - Curtently based on rx3-docker/php-apache:1.7.1-mga9 & rx3-docker/postgresql:1.2.0-mga9 images, + - Currently based on rx3-docker/php-apache:1.7.3-mga9 & rx3-docker/postgresql:1.2.1-mga9 images, - Sync with RoundCubeMail V 1.7.4 Rx3 RPM, - Add the following plugins: - CardDav (RCMCardDAV) V 5.4.1, - Calendar (texxasrulez) V 3.6.1 with CalDav support & Rx3 shared calendar patch, - LibCalendaring V 3.6.1, - - LibKolab V 3.6.1. + - LibKolab V 3.6.1, + - Passowrd setup to use a local PopPassD server. diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 3946beb..2bf551e 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,8 +1,17 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3-Docker/RoundCubeMail V 1.0.3 - A. GIBERT - 2026/11/02 +------------------------------------------------------------------------------------------------------------------------------------ + +- Now use rx3-docker/php-apache:1.7.3-mga9 & rx3-docker/postgresql:1.2.1-mga9 images, +- Password plugin setup. + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3-Docker/RoundCubeMail V 1.0.2 - A. GIBERT - 2026/10/22 ------------------------------------------------------------------------------------------------------------------------------------ -- Use now rx3-docker/php-apache:1.7.1-mga9 image. +- Now use rx3-docker/php-apache:1.7.1-mga9 image. diff --git a/compose.yaml b/compose.yaml index 3646751..1e78cc0 100644 --- a/compose.yaml +++ b/compose.yaml @@ -106,6 +106,11 @@ services: - ./${WA_LOG_MAIN_EXT}:${WA_LOG_MAIN_INT} - ./${WA_RCM_CONFIG_EXT}:${WA_RCM_CONFIG_INT} + + - /run/poppassd:/run/poppassd:ro + +# group_add: +# - "468" networks: - appl diff --git a/env.dist b/env.dist index b4f2bce..0a60a3e 100644 --- a/env.dist +++ b/env.dist @@ -21,7 +21,7 @@ APPL_NAME="roundcubemail" APPL_NAME_FULL="RoundCubeMail" APPL_NAME_SHORT="rcm" APPL_ORG="rx3-docker" -APPL_VERSION="1.0.2" +APPL_VERSION="1.0.3" APPL_MAINTAINER='"Arnaud G. GIBERT" ' @@ -75,9 +75,9 @@ DOCKER_TOOLS_EXEPTION_LIBS="postgres:pgsql httpd:/var/www/html" # | 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.0-mga9 - - - postgres - - 5432 - - postgres postgres +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} roundcubemail "Rx3-Docker/RoundCubeMail" ${APPL_VERSION}-mga9 ${ORG_URL_PREFIX} php-apache 1.7.1-mga9 - - 8082 80 - - apache apache +docker_service_add WA webapp ${ORG_URL_PREFIX} roundcubemail "Rx3-Docker/RoundCubeMail" ${APPL_VERSION}-mga9 ${ORG_URL_PREFIX} php-apache 1.7.3-mga9 - - 8082 80 - - apache apache