Merge branch 'release-2.7.0' into stable

osixia · Oct 25, 2018 · b9755d9 · b9755d9
2 parents 5a3d09d + cd7a5b5
commit b9755d9
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ 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 Zammad versioning.
 
+## [2.7.0] - 2018-10-25
+### Changed
+  - Upgrade Zammad version to 2.7.0
+
 ## [2.6.0] - 2018-09-04
 ### Changed
   - Upgrade Zammad version to 2.6.0

diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 NAME = osixia/zammad
-VERSION = 2.6.0
+VERSION = 2.7.0
 
 .PHONY: build build-nocache test tag-latest push push-latest release git-tag-version
 

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 ![Docker Stars](https://img.shields.io/docker/stars/osixia/zammad.svg)
 ![](https://images.microbadger.com/badges/image/osixia/zammad.svg)
 
-Latest release: 2.6.0 - Zammad 2.6.0 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/zammad/) 
+Latest release: 2.7.0 - Zammad 2.7.0 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/zammad/) 
 
 **A docker image to run Zammad.**
 

diff --git a/example/docker-compose.yml b/example/docker-compose.yml
@@ -32,7 +32,7 @@ services:
       - mariadb:/var/lib/mysql
 
   zammad:
-    image: osixia/zammad:2.6.0
+    image: osixia/zammad:2.7.0
     command: -l info
     labels:
       - "io.rancher.container.pull_image: always"

diff --git a/example/kubernetes/zammad-deployment.yaml b/example/kubernetes/zammad-deployment.yaml
@@ -15,7 +15,7 @@ spec:
       automountServiceAccountToken: false
       containers:
         - name: zammad
-          image: osixia/zammad:2.6.0
+          image: osixia/zammad:2.7.0
           imagePullPolicy: Always
           resources:
             requests:

diff --git a/image/Dockerfile b/image/Dockerfile
@@ -4,8 +4,8 @@ ENV ZAMMAD_DIR /home/zammad
 ENV ZAMMAD_USER zammad
 ENV RAILS_ENV production
 
-ARG ZAMMAD_VERSION=2.6.0
-ARG ZAMMAD_MD5=ede645df6f942cc69b2f948b3855cc1c
+ARG ZAMMAD_VERSION=2.7.0
+ARG ZAMMAD_MD5=a2a260311159f84bf7935eb226f60688
 
 ARG GOSU_VERSION=1.10