Update to Roundcube 1.4.0 and php:7.3 base images

diff --git a/.travis.yml b/.travis.yml
index 01ff9aae27727182ffd9e77532454ad947b78867..3737a07a4c95d5d7bfd8e0e40e8a53ac4cc4f74a 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,6 +27,6 @@ notifications:
   email: false
 
 env:
-  - VERSION=1.3.10 VARIANT=apache
-  - VERSION=1.3.10 VARIANT=fpm
-  - VERSION=1.3.10 VARIANT=fpm-alpine
+  - VERSION=1.4.0 VARIANT=apache
+  - VERSION=1.4.0 VARIANT=fpm
+  - VERSION=1.4.0 VARIANT=fpm-alpine

diff --git a/README.md b/README.md
index f44d896dd81f9c86eb68b7fb488fc46705cacd84..7a2dc469cde69ed56e83e607c446abd1de39d7a1 100644 (file)
--- a/README.md
+++ b/README.md
@@ -12,6 +12,14 @@ docker run -e ROUNDCUBEMAIL_DEFAULT_HOST=mail -e ROUNDCUBEMAIL_SMTP_SERVER=mail
 
 where `mail` should be replaced by your host name for the IMAP and SMTP server.
 
+## Tags and Variants
+
+Roundcube comes in three different variants (`apache`, `fpm` and `fpm-alpine`) which are all built on top of official `php` images of the same variants.
+
+The `latest-*` tags always contain the **latest stable** version of Roundcube Webmail with the latest version of the `php` base images available. For recent major versions of Roundcube we have tags like `1.3.x`. Those are continuously updated with versions of the according release series and updates to the base images.
+
+We also publish full version tags (e.g. `1.3.10`) but these just represent the version and base image at the time of the release. These tags do not receive any updates.
+
 ## Configuration/Environment Variables
 
 The following env variables can be set to configure your Roundcube Docker instance:
@@ -85,7 +93,7 @@ For example, it may be used to increase the PHP memory limit (`memory_limit=128M
 ## Building a Docker image
 
 Use the `Dockerfile` in this repository to build your own Docker image.
-It pulls the latest build of Roundcube Webmail from the Github download page and builds it on top of a `php:7.2-apache` Docker image.
+It pulls the latest build of Roundcube Webmail from the Github download page and builds it on top of a `php:7.3-apache` Docker image.
 
 Build it from this directory with
 

diff --git a/apache/Dockerfile b/apache/Dockerfile
index cf12eff8d9d3f547998ad3b252a8bbef370af1dc..86a3c947a28588cdf6c436313f1b0d7937d7746c 100644 (file)
--- a/apache/Dockerfile
+++ b/apache/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.2-apache
+FROM php:7.3-apache
 LABEL maintainer="Thomas Bruederli <thomas@roundcube.net>"
 
 RUN set -ex; \
@@ -14,7 +14,7 @@ RUN set -ex; \
                libpng-dev \
                libpq-dev \
                libsqlite3-dev \
-               zlib1g-dev \
+               libzip-dev \
        ; \
        \
        debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
@@ -54,7 +54,7 @@ VOLUME /var/www/html
 VOLUME /tmp/roundcube-temp
 
 # Define Roundcubemail version
-ENV ROUNDCUBEMAIL_VERSION 1.3.10
+ENV ROUNDCUBEMAIL_VERSION 1.4.0
 
 # Download package and extract to web volume
 RUN set -ex; \

diff --git a/apache/docker-entrypoint.sh b/apache/docker-entrypoint.sh
index a8f7cbd665220666668b434be9b89922198d580b..fa25ac09ea66af1bc4665602f0c550ec394de346 100755 (executable)
--- a/apache/docker-entrypoint.sh
+++ b/apache/docker-entrypoint.sh
@@ -83,6 +83,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
     \$config['plugins'] = ['${ROUNDCUBEMAIL_PLUGINS_PHP}'];
     \$config['zipdownload_selection'] = true;
     \$config['log_driver'] = 'stdout';
+    \$config['skin'] = 'larry';
     " > config/config.inc.php
 
     for fn in `ls /var/roundcube/config/*.php 2>/dev/null || true`; do

diff --git a/fpm-alpine/Dockerfile b/fpm-alpine/Dockerfile
index 9430ef0409581cde36f9ca6cc50b2d35e9091a2a..58d426316c19466776485898dd5336b063b820ab 100644 (file)
--- a/fpm-alpine/Dockerfile
+++ b/fpm-alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.2-fpm-alpine
+FROM php:7.3-fpm-alpine
 LABEL maintainer="Thomas Bruederli <thomas@roundcube.net>"
 
 # entrypoint.sh and cron.sh dependencies
@@ -14,6 +14,7 @@ RUN set -ex; \
                icu-dev \
                libjpeg-turbo-dev \
                libpng-dev \
+               libzip-dev \
                openldap-dev \
                postgresql-dev \
                sqlite-dev \
@@ -47,7 +48,7 @@ VOLUME /var/www/html
 VOLUME /tmp/roundcube-temp
 
 # Define Roundcubemail version
-ENV ROUNDCUBEMAIL_VERSION 1.3.10
+ENV ROUNDCUBEMAIL_VERSION 1.4.0
 
 # Download package and extract to web volume
 RUN set -ex; \

diff --git a/fpm-alpine/docker-entrypoint.sh b/fpm-alpine/docker-entrypoint.sh
index a8f7cbd665220666668b434be9b89922198d580b..fa25ac09ea66af1bc4665602f0c550ec394de346 100755 (executable)
--- a/fpm-alpine/docker-entrypoint.sh
+++ b/fpm-alpine/docker-entrypoint.sh
@@ -83,6 +83,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
     \$config['plugins'] = ['${ROUNDCUBEMAIL_PLUGINS_PHP}'];
     \$config['zipdownload_selection'] = true;
     \$config['log_driver'] = 'stdout';
+    \$config['skin'] = 'larry';
     " > config/config.inc.php
 
     for fn in `ls /var/roundcube/config/*.php 2>/dev/null || true`; do

diff --git a/fpm/Dockerfile b/fpm/Dockerfile
index 073350cf1927b4e9b62eb08c694211f910f37fa0..5876ab6719d8eed1e9c25f99e97905151ca8d482 100644 (file)
--- a/fpm/Dockerfile
+++ b/fpm/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.2-fpm
+FROM php:7.3-fpm
 LABEL maintainer="Thomas Bruederli <thomas@roundcube.net>"
 
 RUN set -ex; \
@@ -14,7 +14,7 @@ RUN set -ex; \
                libpng-dev \
                libpq-dev \
                libsqlite3-dev \
-               zlib1g-dev \
+               libzip-dev \
        ; \
        \
        debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
@@ -52,7 +52,7 @@ VOLUME /var/www/html
 VOLUME /tmp/roundcube-temp
 
 # Define Roundcubemail version
-ENV ROUNDCUBEMAIL_VERSION 1.3.10
+ENV ROUNDCUBEMAIL_VERSION 1.4.0
 
 # Download package and extract to web volume
 RUN set -ex; \

diff --git a/fpm/docker-entrypoint.sh b/fpm/docker-entrypoint.sh
index a8f7cbd665220666668b434be9b89922198d580b..fa25ac09ea66af1bc4665602f0c550ec394de346 100755 (executable)
--- a/fpm/docker-entrypoint.sh
+++ b/fpm/docker-entrypoint.sh
@@ -83,6 +83,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
     \$config['plugins'] = ['${ROUNDCUBEMAIL_PLUGINS_PHP}'];
     \$config['zipdownload_selection'] = true;
     \$config['log_driver'] = 'stdout';
+    \$config['skin'] = 'larry';
     " > config/config.inc.php
 
     for fn in `ls /var/roundcube/config/*.php 2>/dev/null || true`; do