diff --git a/Dockerfile b/Dockerfile index a93efaa..2a5f4ac 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,12 +25,6 @@ ARG RCM_ENIGMA_DIR=${RCM_LIB_DIR}/plugins/enigma ARG RCM_CONFIG_DIR=/etc/roundcubemail ARG RCM_CONFIG_FILE=${RCM_CONFIG_DIR}/config.inc.php ARG RCM_LOG_DIR=/var/log/roundcubemail -ARG RCM_PLUGINS_CARDAV_URL=https://mirror.rx3.net/external/roundcubemail/carddav-v5.1.4.tar.gz -ARG RCM_PLUGINS_LIBKOLAB_URL=https://mirror.rx3.net/external/roundcubemail/libkolab-3.6.1.tar.gz -ARG RCM_PLUGINS_LIBCALENDARING_URL=https://mirror.rx3.net/external/roundcubemail/libcalendaring-3.6.1.tar.gz -ARG RCM_PLUGINS_CALENDAR_URL=https://mirror.rx3.net/external/roundcubemail/calendar-3.6.0-2rx3.tar.gz -ARG RCM_FIX_PATH=/usr/share/roundcubemail/vendor/pear/pear-core-minimal/src -ARG RCM_PEAR_PATH=/usr/share/pear @@ -79,8 +73,15 @@ else sed -i -e "s/RCM_CONFIG_INSTALL/\$config[`enable_installer`] = false;/" '${RCM_CONFIG_FILE}' \n\ fi \n\ \n\ -echo -n "\$prefs[`default`] = [ `accountname` => `${RCM_CARDDAV_NAME}`, `username` => `%u`, " >> '${RCM_CONFIG_DIR}'/carddav.inc.php \n\ -echo "`password` => `%p`, `discovery_url` => `${RCM_CARDDAV_URL}`, ];" >> '${RCM_CONFIG_DIR}'/carddav.inc.php \n\ + \n\ +if [[ "${RCM_CARDDAV_NAME}" != "" ]] \n\ +then \n\ + carddav_config+="\$prefs[`default`] = [ `accountname` => `${RCM_CARDDAV_NAME}`, `username` => `%u`, " \n\ + carddav_config+="`password` => `%p`, `discovery_url` => `${RCM_CARDDAV_URL}`, ];" \n\ + \n\ + sed -i -e "s*// RCM_CARDDAV_CONFIG*${carddav_config}*" '${RCM_CONFIG_DIR}'/carddav.inc.php \n\ +fi \n\ + \n\ \n\ sed -i -e "s%RCM_CALDAV_HOST%${RCM_CALDAV_URL}%" '${RCM_CONFIG_DIR}'/calendar.inc.php \n\ \n\ @@ -106,21 +107,7 @@ sed -i -e "s%mailhub=mail%mailhub=${SMTP_SERVER}%" RUN . /etc/profile.d/rx3.sh && isl --add ${IMG_URL} \ && urpmi.update -a \ - && urpmi --force wget ssmtp roundcubemail php-zip php-imagick php-xmlreader php-xmlwriter gnupg2 unzip composer \ - && wget -q -O- "${RCM_PLUGINS_CARDAV_URL}" | tar xzf - -C "${RCM_PLUGINS_DIR}" \ - && wget -q -O- "${RCM_PLUGINS_LIBKOLAB_URL}" | tar xzf - -C "${RCM_PLUGINS_DIR}" \ - && wget -q -O- "${RCM_PLUGINS_LIBCALENDARING_URL}" | tar xzf - -C "${RCM_PLUGINS_DIR}" \ - && wget -q -O- "${RCM_PLUGINS_CALENDAR_URL}" | tar xzf - -C "${RCM_PLUGINS_DIR}" \ - && cp "${RCM_PLUGINS_DIR}/carddav/config.inc.php.dist" "${RCM_CONFIG_DIR}/carddav.inc.php" \ - && ln -s "${RCM_CONFIG_DIR}/carddav.inc.php" "${RCM_PLUGINS_DIR}/carddav/config.inc.php" \ - && cp "${RCM_PLUGINS_DIR}/calendar/config.inc.php.dist" "${RCM_CONFIG_DIR}/calendar.inc.php" \ - && mkdir -p "${RCM_ENIGMA_DIR}" \ - && mkdir -p "${RCM_FIX_PATH}"/PEAR \ - && mkdir -p "${RCM_FIX_PATH}"/OS \ - && ln -sf "${RCM_PEAR_PATH}"/PEAR.php "${RCM_FIX_PATH}"/PEAR.php \ - && ln -sf "${RCM_PEAR_PATH}"/PEAR/ErrorStack.php "${RCM_FIX_PATH}"/PEAR/ErrorStack.php \ - && ln -sf "${RCM_PEAR_PATH}"/System.php "${RCM_FIX_PATH}"/System.php \ - && ln -sf "${RCM_PEAR_PATH}"/OS/Guess.php "${RCM_FIX_PATH}"/OS/Guess.php \ + && urpmi --force wget ssmtp roundcubemail composer \ && composer require pear/http_request2 -d "${RCM_SHARE_DIR}" \ && mv /etc/httpd/conf/sites.d/roundcubemail.conf "${RCM_HTTPD_CONFIG_FILE}.ref" \ && sed -i -e "s%Alias /roundcubemail%Alias RCM_URL%" -e "s/Require local/Require RCM_CONFIG_AUTH/" "${RCM_HTTPD_CONFIG_FILE}.ref" \ @@ -133,10 +120,11 @@ RUN . /etc/profile.d/rx3.sh && isl --add ${IMG_URL} && sed -i -e "/^ 'archive',/a\ 'calendar',\n 'carddav',\n 'emoticons',\n 'enigma'," "${RCM_CONFIG_FILE}" \ && echo -e "\n\$config['htmleditor'] = 4;" >> "${RCM_CONFIG_FILE}" \ && echo -e "\n\$config['enable_installer'] = false;" >> "${RCM_CONFIG_FILE}" \ - && sed -i -e "s%https://www.domain.com/rounddav/public/%RCM_CALDAV_HOST%" "${RCM_CONFIG_DIR}/calendar.inc.php" \ - && sed -i -e "s%\$config\['calendar_caldav_url'\]%// \$config['calendar_caldav_url']%" "${RCM_CONFIG_DIR}/calendar.inc.php" \ + && sed -i -e "s|// vim:|// RCM_CARDDAV_CONFIG\n// vim:|" "${RCM_CONFIG_DIR}/carddav.inc.php" \ + && sed -i -e "/'calendar_caldav_server'/ s|= .*|= 'RCM_CALDAV_HOST';|" "${RCM_CONFIG_DIR}/calendar.inc.php" \ + && 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 "s/\$config\['calendar_first_day'\] = 0;/\$config['calendar_first_day'] = 1;/" "${RCM_CONFIG_DIR}/calendar.inc.php" \ + && sed -i -e "/'calendar_first_day'/ s|= .*|= 1;|" "${RCM_CONFIG_DIR}/calendar.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 27f8b17..d15eba3 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -6,10 +6,10 @@ This project aims to build a RoundCubeMail docker image. Features: - Curtently based on rx3-docker/php-apache:1.7.0-mga9 & rx3-docker/postgresql:1.2.0-mga9 images, - - Sync with RoundCubeMail V 1.6.18 RPM, + - Sync with RoundCubeMail V 1.7.4 Rx3 RPM, - Add the following plugins: - CardDav (RCMCardDAV) V 5.4.1, - - Calendar (texxasrulez) V 3.6.0 with CalDav support & Rx3 shared calendar patch V 2, + - Calendar (texxasrulez) V 3.6.1 with CalDav support & Rx3 shared calendar patch, - LibCalendaring V 3.6.1, - LibKolab V 3.6.1. diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index a9af66b..5454b3f 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,11 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3-Docker/RoundCubeMail V 1.0.1 - A. GIBERT - 2026/10/13 +------------------------------------------------------------------------------------------------------------------------------------ + +- Use roundcubemail 1.7.4 from Rx3 Mageia RPM with Calendar 3.6.1. + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3-Docker/RoundCubeMail V 1.0.0 - A. GIBERT - 2026/10/04 ------------------------------------------------------------------------------------------------------------------------------------ diff --git a/env.dist b/env.dist index d601d14..2762950 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.0" +APPL_VERSION="1.0.1" APPL_MAINTAINER='"Arnaud G. GIBERT" '