From: Thomas Bruederli <redacted>
Date: Thu, 28 Jul 2022 20:53:34 +0000 (+0200)
Subject: Release version 1.6.0
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=0296150d297aa055dd699d8743f5606d6826babc;p=roundcube-roundcubemail-docker.git

Release version 1.6.0
---

diff --git a/apache/Dockerfile b/apache/Dockerfile
index 9e6bf77..4f967d2 100644
--- 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 3937945..a1a4356 100755
--- 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 6c096b1..20d3a1d 100644
--- 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 3937945..a1a4356 100755
--- 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 9df2e54..243cf40 100644
--- 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 3937945..a1a4356 100755
--- 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 56e9f72..76fb63b 100644
--- 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 6b4dc04..6a89bf4 100644
--- 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 3937945..a1a4356 100644
--- 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}'])));