Skip to content

Commit

Permalink
Merge branch 'release-1.3.7' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
BertrandGouny committed Jul 28, 2018
2 parents 298f183 + 341e0dc commit 16741e9
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 7 deletions.
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +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.6] - 2018-04-23
## [1.3.7] - 2018-07-28
### Changed
- Upgrade roundcube version to 1.3.7

## [1.3.6] - 2018-03-16
### Changed
- Upgrade roundcube version to 1.3.6

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
NAME = osixia/roundcube
VERSION = 1.3.6
VERSION = 1.3.7

.PHONY: build build-nocache test tag-latest push push-latest release git-tag-version

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.6 - roundcube 1.3.6 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/roundcube/) 
Latest release: 1.3.7 - roundcube 1.3.7 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/roundcube/) 

**A docker image to run roundcube.**

Expand Down
7 changes: 3 additions & 4 deletions image/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
FROM osixia/web-baseimage:1.1.1
MAINTAINER Bertrand Gouny <[email protected]>

# roundcube version
ARG ROUNDCUBE_VERSION=1.3.6
ARG ROUNDCUBE_SHA256=f1b86e97cc8fd69bb1957d4115762af6ea2d6957ea17b33dd3ec2995662670d9
ARG ROUNDCUBE_VERSION=1.3.7
ARG ROUNDCUBE_SHA256=fb274b3384c69a259538588c49ee4795b3dc3fde8b2fe30325cfa6079b5ee875

# MariaDB version
ARG MARIADB_MAJOR=10.2
ARG MARIADB_MAJOR=10.3

# Install apache2 and php7.0-fpm using osixia/baseimage utils
# Caution: /container/tool/install-service-available arguments order is important
Expand Down

0 comments on commit 16741e9

Please sign in to comment.