Merge branch 'release-1.3.10' into stable

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project follows roundcube versioning.
 
+## [1.3.10] - 2018-08-29
+### Changed
+  - Upgrade roundcube version to 1.3.10
+  - Upgrade baseimage to web-baseimage:1.2.0
+
 ## [1.3.9] - 2018-04-05
 ### Changed
   - Upgrade roundcube version to 1.3.9

Makefile

@@ -1,5 +1,5 @@
 NAME = osixia/roundcube
-VERSION = 1.3.9
+VERSION = 1.3.10
 
 .PHONY: build build-nocache test tag-latest push push-latest release git-tag-version
 

README.md

@@ -4,7 +4,7 @@
 ![Docker Stars](https://img.shields.io/docker/stars/osixia/roundcube.svg)
 ![](https://images.microbadger.com/badges/image/osixia/roundcube.svg)
 
-Latest release: 1.3.9 - roundcube 1.3.9 -  [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/roundcube/) 
+Latest release: 1.3.10 - roundcube 1.3.9 -  [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/roundcube/) 
 
 **A docker image to run roundcube.**
 

image/Dockerfile

@@ -1,15 +1,15 @@
-FROM osixia/web-baseimage:1.1.2
+FROM osixia/web-baseimage:1.2.0
 
 # roundcube version
-ARG ROUNDCUBE_VERSION=1.3.9
-ARG ROUNDCUBE_SHA256=726db4ffb33a7154dd432cbb99810ab9d02512c7f1987a6119e9ac7f595521ad
+ARG ROUNDCUBE_VERSION=1.3.10
+ARG ROUNDCUBE_SHA256=69fe11550a0f5711020ecd55c6ad36394580800a68d43bb69ecedc91f36ba8bf
 
 # MariaDB version
 ARG MARIADB_MAJOR=10.3
 
-# Install apache2 and php7.0-fpm using osixia/baseimage utils
+# Install apache2 and php7.3-fpm using osixia/baseimage utils
 # Caution: /container/tool/install-service-available arguments order is important
-# php7.0-fpm install will detect apache2 and configure it
+# php7.3-fpm install will detect apache2 and configure it
 
 # Add MariaDB repository
 RUN apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 0xF1656F24C74CD1D8 \
@@ -24,26 +24,26 @@ RUN apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 0xF1656F24C74CD1D8
 # Download, check integrity and unzip roundcube to /var/www/roundcube_bootstrap
 RUN apt-get update \
   && /container/tool/add-multiple-process-stack \
-  && /container/tool/add-service-available :apache2 :php7.0-fpm :ssl-tools \
+  && /container/tool/add-service-available :apache2 :php7.3-fpm :ssl-tools \
   && LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
   aspell \
   aspell-en \
   aspell-fr \
   ca-certificates \
   curl \
   mariadb-client-$MARIADB_MAJOR \
-  php7.0-enchant \
-  php7.0-gd \
-  php7.0-intl \
-  php7.0-json \
-  php7.0-ldap \
-  php7.0-mcrypt \
-  php7.0-mysql \
-  php7.0-pgsql \
-  php7.0-sqlite3 \
+  php-enchant \
+  php-gd \
+  php-intl \
+  php-json \
+  php-ldap \
+  php-mysql \
+  php-pgsql \
+  php-sqlite3 \
   php-apcu \
   php-gettext \
   php-pear \
+  php-zip \
   && curl -o roundcube.tar.gz -SL https://github.com/roundcube/roundcubemail/releases/download/${ROUNDCUBE_VERSION}/roundcubemail-${ROUNDCUBE_VERSION}-complete.tar.gz \
   && echo "${ROUNDCUBE_SHA256} *roundcube.tar.gz" | sha256sum -c - \
   && mkdir -p /var/www/roundcube_bootstrap /var/www/roundcube \

image/environment/default.startup.yaml

@@ -16,4 +16,4 @@ ROUNDCUBE_MARIADB_CLIENT_TLS_KEY_FILENAME: database-client.key
 LDAP_CLIENT_SSL_HELPER_PREFIX: ldapclient
 MARIADB_CLIENT_SSL_HELPER_PREFIX: database
 
-SSL_HELPER_AUTO_RENEW_SERVICES_IMPACTED: :apache2 :php7.0-fpm
+SSL_HELPER_AUTO_RENEW_SERVICES_IMPACTED: :apache2 :php7.3-fpm

image/service/roundcube/install.sh

@@ -1,11 +1,11 @@
 #!/bin/bash -e
 # this script is run during the image build
 
-cat /container/service/roundcube/assets/php7.0-fpm/pool.conf >> /etc/php/7.0/fpm/pool.d/www.conf
-rm /container/service/roundcube/assets/php7.0-fpm/pool.conf
+cat /container/service/roundcube/assets/php7.3-fpm/pool.conf >> /etc/php/7.3/fpm/pool.d/www.conf
+rm /container/service/roundcube/assets/php7.3-fpm/pool.conf
 
-cp -f /container/service/roundcube/assets/php7.0-fpm/opcache.ini /etc/php/7.0/fpm/conf.d/opcache.ini
-rm /container/service/roundcube/assets/php7.0-fpm/opcache.ini
+cp -f /container/service/roundcube/assets/php7.3-fpm/opcache.ini /etc/php/7.3/fpm/conf.d/opcache.ini
+rm /container/service/roundcube/assets/php7.3-fpm/opcache.ini
 
 mkdir -p /var/www/tmp
 chown www-data:www-data /var/www/tmp