From ee454755676c988a756916949ffb6677d17a2b05 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Tue, 2 Nov 2021 12:21:40 +0100 Subject: [PATCH] updated roundcube. added cleanup run at startup --- webmails/roundcube/Dockerfile | 7 ++----- webmails/roundcube/start.py | 6 ++++++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/webmails/roundcube/Dockerfile b/webmails/roundcube/Dockerfile index 1f788918..a290c24a 100644 --- a/webmails/roundcube/Dockerfile +++ b/webmails/roundcube/Dockerfile @@ -17,9 +17,9 @@ RUN apt-get update && apt-get install -y \ # Shared layer between nginx, dovecot, postfix, postgresql, rspamd, unbound, rainloop, roundcube RUN pip3 install socrate -ENV ROUNDCUBE_URL https://github.com/roundcube/roundcubemail/releases/download/1.4.11/roundcubemail-1.4.11-complete.tar.gz +ENV ROUNDCUBE_URL https://github.com/roundcube/roundcubemail/releases/download/1.5.0/roundcubemail-1.5.0-complete.tar.gz -ENV CARDDAV_URL https://github.com/mstilkerich/rcmcarddav/releases/download/v4.1.2/carddav-v4.1.2.tar.gz +ENV CARDDAV_URL https://github.com/mstilkerich/rcmcarddav/releases/download/v4.2.2/carddav-v4.2.2.tar.gz RUN apt-get update && apt-get install -y \ zlib1g-dev libzip4 libzip-dev libpq-dev \ @@ -35,9 +35,6 @@ RUN apt-get update && apt-get install -y \ && mv carddav html/plugins/ \ && cd html \ && rm -rf CHANGELOG INSTALL LICENSE README.md UPGRADING composer.json-dist installer composer.* \ - && sed -i 's,mod_php5.c,mod_php7.c,g' .htaccess \ - && sed -i 's,^php_value.*post_max_size,#&,g' .htaccess \ - && sed -i 's,^php_value.*upload_max_filesize,#&,g' .htaccess \ && ln -sf index.php /var/www/html/sso.php \ && ln -sf /dev/stderr /var/www/html/logs/errors.log \ && chown -R root:root . \ diff --git a/webmails/roundcube/start.py b/webmails/roundcube/start.py index efaac357..64147681 100755 --- a/webmails/roundcube/start.py +++ b/webmails/roundcube/start.py @@ -53,6 +53,12 @@ try: subprocess.check_call(["/var/www/html/bin/update.sh", "--version=?", "-y"], stderr=subprocess.STDOUT) except subprocess.CalledProcessError as e: quit(1) +else: + try: + print("Cleaning database") + subprocess.check_call(["/var/www/html/bin/cleandb.sh"], stderr=subprocess.STDOUT) + except subprocess.CalledProcessError as e: + quit(1) # Setup database permissions os.system("chown -R www-data:www-data /data")