From eadb3c5aaabafd96598add8365eb35015d4590e0 Mon Sep 17 00:00:00 2001
From: Sebastian Hugentobler <sebastian@vanwa.ch>
Date: Sat, 10 Sep 2022 18:18:22 +0200
Subject: [PATCH] ush to version 1.6.0

---
 Dockerfile                                     | 5 ++---
 rootfs/etc/confd/templates/config.inc.php.tmpl | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index bfa733f..d095bd0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,8 +20,8 @@ RUN echo "$COMPOSER_SHA256_SUM  composer.phar" | sha256sum -c - || exit 1
 RUN mv composer.phar /usr/bin/composer
 RUN chmod +x /usr/bin/composer
 
-ENV VERSION=1.5.3
-ENV SHA256_SUM=4bcfac219f2e0005c912dac3227743cc1ed0ded69c822f74c81a70d041e5a3bd
+ENV VERSION=1.6.0
+ENV SHA256_SUM=2409ccdfe2e465f086cb9fc18c88dfe0aaf6ccc23924564975061209921694ba
 RUN wget https://github.com/roundcube/roundcubemail/releases/download/$VERSION/roundcubemail-$VERSION-complete.tar.gz
 RUN echo "$SHA256_SUM  roundcubemail-$VERSION-complete.tar.gz" | sha256sum -c - || exit 1
 RUN mkdir -p /var/lib/roundcube
@@ -29,7 +29,6 @@ RUN tar xzf roundcubemail-$VERSION-complete.tar.gz -C /var/lib/roundcube --strip
 
 FROM docker.io/thallian/php8-fpm:3.16
 
-
 RUN apk add --no-cache \
     openssl \
     tar \
diff --git a/rootfs/etc/confd/templates/config.inc.php.tmpl b/rootfs/etc/confd/templates/config.inc.php.tmpl
index 60695e5..1a46fac 100644
--- a/rootfs/etc/confd/templates/config.inc.php.tmpl
+++ b/rootfs/etc/confd/templates/config.inc.php.tmpl
@@ -7,7 +7,7 @@ $config['log_driver'] = 'stdout';
 
 $config['skin'] = 'elastic';
 
-$config['default_host'] = '{{getenv "IMAP_HOST" "tls://%n"}}';
+$config['imap_host'] = '{{getenv "IMAP_HOST" "tls://%n"}}';
 $config['imap_conn_options'] = array(
   'ssl'         => array(
       'verify_peer'      => true,
@@ -15,8 +15,7 @@ $config['imap_conn_options'] = array(
   ),
 );
 
-$config['smtp_server'] = '{{getenv "SMTP_HOST" "tls://%n"}}';
-$config['smtp_port'] = {{getenv "SMTP_PORT" "587"}};
+$config['smtp_host'] = '{{getenv "SMTP_HOST" "tls://%n"}}:{{getenv "SMTP_PORT" "587"}}';
 $config['smtp_user'] = '%u';
 $config['smtp_pass'] = '%p';
 /*$config['smtp_conn_options'] = array(