Merge branch 'release-2.3.0' into stable

CHANGELOG.md

@@ -1,12 +1,24 @@
 # Changelog
+All notable changes to this project will be documented in this file.
 
-## 2.2.0
-  - Zammad 2.2.0
-  - Add memcached
-  - Add ZAMMAD_ELASTICSEARCH_USER and ZAMMAD_ELASTICSEARCH_PASS environment variables
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+and this project follows Zammad versioning.
 
-## 2.1.0
-  - Zammad 2.1.0
+## [2.3.0] - 2018-01-31
+### Changed
+  - Upgrade Zammad version to 2.3.0
 
-## 2.0.0
- - Init
+## [2.2.0] - 2017-12-08
+### Added
+  - memcached
+  - ZAMMAD_ELASTICSEARCH_USER and ZAMMAD_ELASTICSEARCH_PASS environment variables
+
+### Changed
+  - Upgrade Zammad version to 2.2.0
+
+## [2.1.0] - 2017-10-25
+### Changed
+  - Upgrade Zammad version to 2.1.0
+
+## [2.0.0] - 2017-10-25
+Initial release

Makefile

@@ -1,5 +1,5 @@
 NAME = osixia/zammad
-VERSION = 2.2.0
+VERSION = 2.3.0
 
 .PHONY: build build-nocache test tag-latest push push-latest release git-tag-version
 

README.md

@@ -4,8 +4,22 @@
 ![Docker Stars](https://img.shields.io/docker/stars/osixia/zammad.svg)
 ![](https://images.microbadger.com/badges/image/osixia/zammad.svg)
 
-Latest release: 2.2.0 - Zammad 2.2.0 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/zammad/) 
+Latest release: 2.3.0 - Zammad 2.3.0 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/zammad/) 
 
 **A docker image to run Zammad.**
 
 > Zammad website : [zammad.org](https://zammad.org/)
+
+### Under the hood: osixia/web-baseimage
+
+This image is based on osixia/web-baseimage.
+More info: https://github.com/osixia/docker-web-baseimage
+
+## Security
+If you discover a security vulnerability within this docker image, please send an email to the Osixia! team at [email protected]. For minor vulnerabilities feel free to add an issue here on github.
+
+Please include as many details as possible.
+
+## Changelog
+
+Please refer to: [CHANGELOG.md](CHANGELOG.md)

example/docker-compose.yml

@@ -32,7 +32,7 @@ services:
       - mariadb:/var/lib/mysql
 
   zammad:
-    image: osixia/zammad:2.2.0
+    image: osixia/zammad:2.3.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.2.0
+          image: osixia/zammad:2.3.0
           imagePullPolicy: Always
           resources:
             requests:

image/Dockerfile

@@ -1,12 +1,12 @@
-FROM ruby:2.4.1-slim-stretch
+FROM ruby:2.4.2-slim-stretch
 MAINTAINER Bertrand Gouny <[email protected]>
 
 ENV ZAMMAD_DIR /home/zammad
 ENV ZAMMAD_USER zammad
 ENV RAILS_ENV production
 
-ARG ZAMMAD_VERSION=2.2.0
-ARG ZAMMAD_MD5=d3657d09d8f7cbfc3e37bf8f8d4d82c6
+ARG ZAMMAD_VERSION=2.3.0
+ARG ZAMMAD_MD5=0d118fdde02934e18c0752a033c6a5fb
 
 ARG GOSU_VERSION=1.10