diff --git a/CHANGELOG.md b/CHANGELOG.md index 1097669..acb610c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,14 @@ 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.9] - 2018-04-05 +### Changed + - Upgrade roundcube version to 1.3.9 + - Upgrade baseimage to web-baseimage:1.1.2 + +### Fixed + - Cron log with /usr/bin/logger + ## [1.3.8] - 2018-11-08 ### Changed - Upgrade roundcube version to 1.3.8 @@ -98,6 +106,9 @@ and this project follows roundcube versioning. ## 0.1.0 - 2015-12-07 Initial release +[1.3.9]: https://github.com/osixia/docker-roundcube/compare/v1.3.8...v1.3.9 +[1.3.8]: https://github.com/osixia/docker-roundcube/compare/v1.3.7...v1.3.8 +[1.3.7]: https://github.com/osixia/docker-roundcube/compare/v1.3.6...v1.3.7 [1.3.6]: https://github.com/osixia/docker-roundcube/compare/v1.3.5...v1.3.6 [1.3.5]: https://github.com/osixia/docker-roundcube/compare/v1.3.4...v1.3.5 [1.3.4]: https://github.com/osixia/docker-roundcube/compare/v1.3.3...v1.3.4 diff --git a/Makefile b/Makefile index 3ea7906..e92faed 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ NAME = osixia/roundcube -VERSION = 1.3.8 +VERSION = 1.3.9 .PHONY: build build-nocache test tag-latest push push-latest release git-tag-version diff --git a/README.md b/README.md index b53810e..4cf1c0a 100644 --- a/README.md +++ b/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.8 - roundcube 1.3.8 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/roundcube/)  +Latest release: 1.3.9 - roundcube 1.3.9 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/roundcube/)  **A docker image to run roundcube.** diff --git a/image/Dockerfile b/image/Dockerfile index 8dae441..318cf59 100644 --- a/image/Dockerfile +++ b/image/Dockerfile @@ -1,8 +1,8 @@ -FROM osixia/web-baseimage:1.1.1 +FROM osixia/web-baseimage:1.1.2 # roundcube version -ARG ROUNDCUBE_VERSION=1.3.8 -ARG ROUNDCUBE_SHA256=c49e33f9643f98311b700138a1e1a0358c37b1205250e1124bd43d7f9a920d05 +ARG ROUNDCUBE_VERSION=1.3.9 +ARG ROUNDCUBE_SHA256=726db4ffb33a7154dd432cbb99810ab9d02512c7f1987a6119e9ac7f595521ad # MariaDB version ARG MARIADB_MAJOR=10.3 @@ -13,45 +13,45 @@ ARG MARIADB_MAJOR=10.3 # Add MariaDB repository RUN apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 0xF1656F24C74CD1D8 \ - && echo "deb http://ftp.igh.cnrs.fr/pub/mariadb/repo/$MARIADB_MAJOR/debian stretch main" > /etc/apt/sources.list.d/mariadb.list \ - && { \ - echo 'Package: *'; \ - echo 'Pin: release o=MariaDB'; \ - echo 'Pin-Priority: 999'; \ - } > /etc/apt/preferences.d/mariadb + && echo "deb http://ftp.igh.cnrs.fr/pub/mariadb/repo/$MARIADB_MAJOR/debian stretch main" > /etc/apt/sources.list.d/mariadb.list \ + && { \ + echo 'Package: *'; \ + echo 'Pin: release o=MariaDB'; \ + echo 'Pin-Priority: 999'; \ + } > /etc/apt/preferences.d/mariadb # 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 \ - && 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-apcu \ - php-gettext \ - php-pear \ - && 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 \ - && tar -xzf roundcube.tar.gz --strip 1 -C /var/www/roundcube_bootstrap \ - && apt-get remove -y --purge --auto-remove curl \ - && rm roundcube.tar.gz \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* + && /container/tool/add-multiple-process-stack \ + && /container/tool/add-service-available :apache2 :php7.0-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-apcu \ + php-gettext \ + php-pear \ + && 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 \ + && tar -xzf roundcube.tar.gz --strip 1 -C /var/www/roundcube_bootstrap \ + && apt-get remove -y --purge --auto-remove curl \ + && rm roundcube.tar.gz \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* # Add service directory to /container/service ADD service /container/service diff --git a/image/service/backup/assets/cronjobs b/image/service/backup/assets/cronjobs index e6968dc..829a5f7 100644 --- a/image/service/backup/assets/cronjobs +++ b/image/service/backup/assets/cronjobs @@ -1,3 +1,3 @@ # Backup mail directory -{{ ROUNDCUBE_BACKUP_CRON_EXP }} root /sbin/roundcube-backup > /proc/1/fd/1 2>/proc/1/fd/2 +{{ ROUNDCUBE_BACKUP_CRON_EXP }} root /sbin/roundcube-backup 2>&1 | /usr/bin/logger -t cron_backup # empty line