Merge branch 'release-2.8.0' into stable

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.8.0] - 2019-01-21
+### Changed
+  - Upgrade Zammad version to 2.8.0
+
 ## [2.7.0] - 2018-10-25
 ### Changed
   - Upgrade Zammad version to 2.7.0
@@ -39,6 +43,9 @@ and this project follows Zammad versioning.
 ## 2.0.0 - 2017-10-25
 Initial release
 
+[2.8.0]: https://github.com/osixia/docker-openldap/compare/v2.7.0...v2.8.0
+[2.7.0]: https://github.com/osixia/docker-openldap/compare/v2.6.0...v2.7.0
+[2.6.0]: https://github.com/osixia/docker-openldap/compare/v2.5.0...v2.6.0
 [2.5.0]: https://github.com/osixia/docker-openldap/compare/v2.4.0...v2.5.0
 [2.4.0]: https://github.com/osixia/docker-openldap/compare/v2.3.0...v2.4.0
 [2.3.0]: https://github.com/osixia/docker-openldap/compare/v2.2.0...v2.3.0

Makefile

@@ -1,5 +1,5 @@
 NAME = osixia/zammad
-VERSION = 2.7.0
+VERSION = 2.8.0
 
 .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/zammad.svg)
 ![](https://images.microbadger.com/badges/image/osixia/zammad.svg)
 
-Latest release: 2.7.0 - Zammad 2.7.0 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/zammad/) 
+Latest release: 2.8.0 - Zammad 2.8.0 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/zammad/) 
 
 **A docker image to run Zammad.**
 

example/docker-compose.yml

@@ -32,7 +32,7 @@ services:
       - mariadb:/var/lib/mysql
 
   zammad:
-    image: osixia/zammad:2.7.0
+    image: osixia/zammad:2.8.0
     command: -l info
     labels:
       - "io.rancher.container.pull_image: always"

example/kubernetes/zammad-deployment.yaml

@@ -15,7 +15,7 @@ spec:
       automountServiceAccountToken: false
       containers:
         - name: zammad
-          image: osixia/zammad:2.7.0
+          image: osixia/zammad:2.8.0
           imagePullPolicy: Always
           resources:
             requests:

image/Dockerfile

@@ -4,8 +4,8 @@ ENV ZAMMAD_DIR /home/zammad
 ENV ZAMMAD_USER zammad
 ENV RAILS_ENV production
 
-ARG ZAMMAD_VERSION=2.7.0
-ARG ZAMMAD_MD5=a2a260311159f84bf7935eb226f60688
+ARG ZAMMAD_VERSION=2.8.0
+ARG ZAMMAD_MD5=b95b6967ab305f71ee927daf409ab7e7
 
 ARG GOSU_VERSION=1.10
 
@@ -34,7 +34,7 @@ RUN apt update \
 ENTRYPOINT ["/container/tool/run"]
 
 # Add MariaDB repository
-RUN apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 0xF1656F24C74CD1D8 \
+RUN apt-key adv --no-tty --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: *'; \
@@ -52,7 +52,7 @@ RUN BUILD_DEPENDENCIES="git build-essential libffi-dev libpq5 libpq-dev" \
     && curl -L -o /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \
     && curl -L -o /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \
     && export GNUPGHOME="$(mktemp -d)" \
-    && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
+    && gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
     && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
     && rm -rf "${GNUPGHOME}" /usr/local/bin/gosu.asc \
     && chmod +x /usr/local/bin/gosu \