Release version 1.6.0

diff --git a/apache/Dockerfile b/apache/Dockerfile
index 9e6bf771b6b204c5943115ff608cdd486292df59..4f967d232be74c42c932c38a070caab5ee54ebfc 100644 (file)
--- a/apache/Dockerfile
+++ b/apache/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.4-apache
+FROM php:8.0-apache
 LABEL maintainer="Thomas Bruederli <thomas@roundcube.net>"
 
 RUN set -ex; \
@@ -68,7 +68,7 @@ COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
 RUN a2enmod rewrite
 
 # Define Roundcubemail version
-ENV ROUNDCUBEMAIL_VERSION 1.5.3
+ENV ROUNDCUBEMAIL_VERSION 1.6.0
 
 # Define the GPG key used for the bundle verification process
 ENV ROUNDCUBEMAIL_KEYID "F3E4 C04B B3DB 5D42 15C4  5F7F 5AB2 BAA1 41C4 F7D5"
@@ -96,9 +96,6 @@ RUN set -ex; \
        rm -rf /usr/src/roundcubemail/installer; \
        chown -R www-data:www-data /usr/src/roundcubemail/logs
 
-# copy the latest version of initdb.sh which supports the --update flag
-RUN curl -fL https://raw.githubusercontent.com/roundcube/roundcubemail/master/bin/initdb.sh > /usr/src/roundcubemail/bin/initdb.sh && chmod +x /usr/src/roundcubemail/bin/initdb.sh
-
 # include the wait-for-it.sh script
 RUN curl -fL https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh > /wait-for-it.sh && chmod +x /wait-for-it.sh
 

diff --git a/apache/docker-entrypoint.sh b/apache/docker-entrypoint.sh
index 39379453b040eccf2824a15601197de3ab140e18..a1a43563809d2d073ff8a41a083c0e60f74ad290 100755 (executable)
--- a/apache/docker-entrypoint.sh
+++ b/apache/docker-entrypoint.sh
@@ -95,10 +95,8 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
   echo "<?php
   \$config['db_dsnw'] = '${ROUNDCUBEMAIL_DSNW}';
   \$config['db_dsnr'] = '${ROUNDCUBEMAIL_DSNR}';
-  \$config['default_host'] = '${ROUNDCUBEMAIL_DEFAULT_HOST}';
-  \$config['default_port'] = '${ROUNDCUBEMAIL_DEFAULT_PORT}';
-  \$config['smtp_server'] = '${ROUNDCUBEMAIL_SMTP_SERVER}';
-  \$config['smtp_port'] = '${ROUNDCUBEMAIL_SMTP_PORT}';
+  \$config['imap_host'] = '${ROUNDCUBEMAIL_DEFAULT_HOST}:${ROUNDCUBEMAIL_DEFAULT_PORT}';
+  \$config['smtp_host'] = '${ROUNDCUBEMAIL_SMTP_SERVER}:${ROUNDCUBEMAIL_SMTP_PORT}';
   \$config['temp_dir'] = '${ROUNDCUBEMAIL_TEMP_DIR}';
   \$config['skin'] = '${ROUNDCUBEMAIL_SKIN}';
   \$config['plugins'] = array_filter(array_unique(array_merge(\$config['plugins'], ['${ROUNDCUBEMAIL_PLUGINS_PHP}'])));

diff --git a/fpm-alpine/Dockerfile b/fpm-alpine/Dockerfile
index 6c096b1f2714cb71b0b834464e19d584e3889d1b..20d3a1dde4e51d3658e0bfdee7a23a6a3512d818 100644 (file)
--- a/fpm-alpine/Dockerfile
+++ b/fpm-alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.4-fpm-alpine
+FROM php:8.0-fpm-alpine
 LABEL maintainer="Thomas Bruederli <thomas@roundcube.net>"
 
 # entrypoint.sh and installto.sh dependencies
@@ -58,7 +58,7 @@ COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
 
 
 # Define Roundcubemail version
-ENV ROUNDCUBEMAIL_VERSION 1.5.3
+ENV ROUNDCUBEMAIL_VERSION 1.6.0
 
 # Define the GPG key used for the bundle verification process
 ENV ROUNDCUBEMAIL_KEYID "F3E4 C04B B3DB 5D42 15C4  5F7F 5AB2 BAA1 41C4 F7D5"
@@ -88,9 +88,6 @@ RUN set -ex; \
        chown -R www-data:www-data /usr/src/roundcubemail/logs; \
        apk del .fetch-deps
 
-# copy the latest version of initdb.sh which supports the --update flag
-RUN curl -fL https://raw.githubusercontent.com/roundcube/roundcubemail/master/bin/initdb.sh > /usr/src/roundcubemail/bin/initdb.sh && chmod +x /usr/src/roundcubemail/bin/initdb.sh
-
 # include the wait-for-it.sh script
 RUN curl -fL https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh > /wait-for-it.sh && chmod +x /wait-for-it.sh
 

diff --git a/fpm-alpine/docker-entrypoint.sh b/fpm-alpine/docker-entrypoint.sh
index 39379453b040eccf2824a15601197de3ab140e18..a1a43563809d2d073ff8a41a083c0e60f74ad290 100755 (executable)
--- a/fpm-alpine/docker-entrypoint.sh
+++ b/fpm-alpine/docker-entrypoint.sh
@@ -95,10 +95,8 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
   echo "<?php
   \$config['db_dsnw'] = '${ROUNDCUBEMAIL_DSNW}';
   \$config['db_dsnr'] = '${ROUNDCUBEMAIL_DSNR}';
-  \$config['default_host'] = '${ROUNDCUBEMAIL_DEFAULT_HOST}';
-  \$config['default_port'] = '${ROUNDCUBEMAIL_DEFAULT_PORT}';
-  \$config['smtp_server'] = '${ROUNDCUBEMAIL_SMTP_SERVER}';
-  \$config['smtp_port'] = '${ROUNDCUBEMAIL_SMTP_PORT}';
+  \$config['imap_host'] = '${ROUNDCUBEMAIL_DEFAULT_HOST}:${ROUNDCUBEMAIL_DEFAULT_PORT}';
+  \$config['smtp_host'] = '${ROUNDCUBEMAIL_SMTP_SERVER}:${ROUNDCUBEMAIL_SMTP_PORT}';
   \$config['temp_dir'] = '${ROUNDCUBEMAIL_TEMP_DIR}';
   \$config['skin'] = '${ROUNDCUBEMAIL_SKIN}';
   \$config['plugins'] = array_filter(array_unique(array_merge(\$config['plugins'], ['${ROUNDCUBEMAIL_PLUGINS_PHP}'])));

diff --git a/fpm/Dockerfile b/fpm/Dockerfile
index 9df2e5450828a7c3bf79828a7efe3f8a2b514035..243cf407b81b973f038271f2079931d7b8358434 100644 (file)
--- a/fpm/Dockerfile
+++ b/fpm/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.4-fpm
+FROM php:8.0-fpm
 LABEL maintainer="Thomas Bruederli <thomas@roundcube.net>"
 
 RUN set -ex; \
@@ -67,7 +67,7 @@ COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
 
 
 # Define Roundcubemail version
-ENV ROUNDCUBEMAIL_VERSION 1.5.3
+ENV ROUNDCUBEMAIL_VERSION 1.6.0
 
 # Define the GPG key used for the bundle verification process
 ENV ROUNDCUBEMAIL_KEYID "F3E4 C04B B3DB 5D42 15C4  5F7F 5AB2 BAA1 41C4 F7D5"
@@ -95,9 +95,6 @@ RUN set -ex; \
        rm -rf /usr/src/roundcubemail/installer; \
        chown -R www-data:www-data /usr/src/roundcubemail/logs
 
-# copy the latest version of initdb.sh which supports the --update flag
-RUN curl -fL https://raw.githubusercontent.com/roundcube/roundcubemail/master/bin/initdb.sh > /usr/src/roundcubemail/bin/initdb.sh && chmod +x /usr/src/roundcubemail/bin/initdb.sh
-
 # include the wait-for-it.sh script
 RUN curl -fL https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh > /wait-for-it.sh && chmod +x /wait-for-it.sh
 

diff --git a/fpm/docker-entrypoint.sh b/fpm/docker-entrypoint.sh
index 39379453b040eccf2824a15601197de3ab140e18..a1a43563809d2d073ff8a41a083c0e60f74ad290 100755 (executable)
--- a/fpm/docker-entrypoint.sh
+++ b/fpm/docker-entrypoint.sh
@@ -95,10 +95,8 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
   echo "<?php
   \$config['db_dsnw'] = '${ROUNDCUBEMAIL_DSNW}';
   \$config['db_dsnr'] = '${ROUNDCUBEMAIL_DSNR}';
-  \$config['default_host'] = '${ROUNDCUBEMAIL_DEFAULT_HOST}';
-  \$config['default_port'] = '${ROUNDCUBEMAIL_DEFAULT_PORT}';
-  \$config['smtp_server'] = '${ROUNDCUBEMAIL_SMTP_SERVER}';
-  \$config['smtp_port'] = '${ROUNDCUBEMAIL_SMTP_PORT}';
+  \$config['imap_host'] = '${ROUNDCUBEMAIL_DEFAULT_HOST}:${ROUNDCUBEMAIL_DEFAULT_PORT}';
+  \$config['smtp_host'] = '${ROUNDCUBEMAIL_SMTP_SERVER}:${ROUNDCUBEMAIL_SMTP_PORT}';
   \$config['temp_dir'] = '${ROUNDCUBEMAIL_TEMP_DIR}';
   \$config['skin'] = '${ROUNDCUBEMAIL_SKIN}';
   \$config['plugins'] = array_filter(array_unique(array_merge(\$config['plugins'], ['${ROUNDCUBEMAIL_PLUGINS_PHP}'])));

diff --git a/templates/Dockerfile-alpine.templ b/templates/Dockerfile-alpine.templ
index 56e9f72fd98d928728b2741715921bcf437d4ca8..76fb63b433fb58210f56bbbb457c2163ad73bcd9 100644 (file)
--- a/templates/Dockerfile-alpine.templ
+++ b/templates/Dockerfile-alpine.templ
@@ -1,4 +1,4 @@
-FROM php:7.4-%%VARIANT%%
+FROM php:8.0-%%VARIANT%%
 LABEL maintainer="Thomas Bruederli <thomas@roundcube.net>"
 
 # entrypoint.sh and installto.sh dependencies
@@ -88,9 +88,6 @@ RUN set -ex; \
        chown -R www-data:www-data /usr/src/roundcubemail/logs; \
        apk del .fetch-deps
 
-# copy the latest version of initdb.sh which supports the --update flag
-RUN curl -fL https://raw.githubusercontent.com/roundcube/roundcubemail/master/bin/initdb.sh > /usr/src/roundcubemail/bin/initdb.sh && chmod +x /usr/src/roundcubemail/bin/initdb.sh
-
 # include the wait-for-it.sh script
 RUN curl -fL https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh > /wait-for-it.sh && chmod +x /wait-for-it.sh
 

diff --git a/templates/Dockerfile-debian.templ b/templates/Dockerfile-debian.templ
index 6b4dc04e2c798a6727570325a36298663c54b4bc..6a89bf4c0e89af7a41087fb8a751fc14a5ba0d79 100644 (file)
--- a/templates/Dockerfile-debian.templ
+++ b/templates/Dockerfile-debian.templ
@@ -1,4 +1,4 @@
-FROM php:7.4-%%VARIANT%%
+FROM php:8.0-%%VARIANT%%
 LABEL maintainer="Thomas Bruederli <thomas@roundcube.net>"
 
 RUN set -ex; \
@@ -95,9 +95,6 @@ RUN set -ex; \
        rm -rf /usr/src/roundcubemail/installer; \
        chown -R www-data:www-data /usr/src/roundcubemail/logs
 
-# copy the latest version of initdb.sh which supports the --update flag
-RUN curl -fL https://raw.githubusercontent.com/roundcube/roundcubemail/master/bin/initdb.sh > /usr/src/roundcubemail/bin/initdb.sh && chmod +x /usr/src/roundcubemail/bin/initdb.sh
-
 # include the wait-for-it.sh script
 RUN curl -fL https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh > /wait-for-it.sh && chmod +x /wait-for-it.sh
 

diff --git a/templates/docker-entrypoint.sh b/templates/docker-entrypoint.sh
index 39379453b040eccf2824a15601197de3ab140e18..a1a43563809d2d073ff8a41a083c0e60f74ad290 100644 (file)
--- a/templates/docker-entrypoint.sh
+++ b/templates/docker-entrypoint.sh
@@ -95,10 +95,8 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
   echo "<?php
   \$config['db_dsnw'] = '${ROUNDCUBEMAIL_DSNW}';
   \$config['db_dsnr'] = '${ROUNDCUBEMAIL_DSNR}';
-  \$config['default_host'] = '${ROUNDCUBEMAIL_DEFAULT_HOST}';
-  \$config['default_port'] = '${ROUNDCUBEMAIL_DEFAULT_PORT}';
-  \$config['smtp_server'] = '${ROUNDCUBEMAIL_SMTP_SERVER}';
-  \$config['smtp_port'] = '${ROUNDCUBEMAIL_SMTP_PORT}';
+  \$config['imap_host'] = '${ROUNDCUBEMAIL_DEFAULT_HOST}:${ROUNDCUBEMAIL_DEFAULT_PORT}';
+  \$config['smtp_host'] = '${ROUNDCUBEMAIL_SMTP_SERVER}:${ROUNDCUBEMAIL_SMTP_PORT}';
   \$config['temp_dir'] = '${ROUNDCUBEMAIL_TEMP_DIR}';
   \$config['skin'] = '${ROUNDCUBEMAIL_SKIN}';
   \$config['plugins'] = array_filter(array_unique(array_merge(\$config['plugins'], ['${ROUNDCUBEMAIL_PLUGINS_PHP}'])));