From fb5b43b022ee099bd315d831e8ea42f9b236a192 Mon Sep 17 00:00:00 2001 From: Bertrand Gouny Date: Wed, 20 Mar 2019 10:46:43 +0100 Subject: [PATCH 1/3] [twgit] Init release 'release-2.9.0'. From ba97a1c2f1848c0d1ccf97aeb57d1945932826b3 Mon Sep 17 00:00:00 2001 From: Bertrand Gouny Date: Wed, 20 Mar 2019 12:45:23 +0100 Subject: [PATCH 2/3] zammad 2.9.0 --- Makefile | 2 +- README.md | 2 +- example/docker-compose.yml | 2 +- example/kubernetes/zammad-deployment.yaml | 2 +- image/Dockerfile | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index fd00e6c..9fe16f5 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ NAME = osixia/zammad -VERSION = 2.8.0 +VERSION = 2.9.0 .PHONY: build build-nocache test tag-latest push push-latest release git-tag-version diff --git a/README.md b/README.md index 077a733..b3eb9d3 100644 --- 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.8.0 - Zammad 2.8.0 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/zammad/)  +Latest release: 2.9.0 - Zammad 2.8.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 index 4f6b8d5..645c8c9 100644 --- a/example/docker-compose.yml +++ b/example/docker-compose.yml @@ -32,7 +32,7 @@ services: - mariadb:/var/lib/mysql zammad: - image: osixia/zammad:2.8.0 + image: osixia/zammad:2.9.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 index 63d58d5..640b34c 100644 --- 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.8.0 + image: osixia/zammad:2.9.0 imagePullPolicy: Always resources: requests: diff --git a/image/Dockerfile b/image/Dockerfile index 58ff015..68cbbd8 100644 --- 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.8.0 -ARG ZAMMAD_MD5=b95b6967ab305f71ee927daf409ab7e7 +ARG ZAMMAD_VERSION=2.9.0 +ARG ZAMMAD_MD5=08bd2f55770f23ee780a7dbd5c8c4cc8 ARG GOSU_VERSION=1.10 @@ -43,7 +43,7 @@ RUN apt-key adv --no-tty --recv-keys --keyserver keyserver.ubuntu.com 0xF1656F24 } > /etc/apt/preferences.d/mariadb # Install dependencies, GOSU & zammad -RUN BUILD_DEPENDENCIES="git build-essential libffi-dev libpq5 libpq-dev" \ +RUN BUILD_DEPENDENCIES="git build-essential libffi-dev libpq5 libpq-dev libimlib2 libimlib2-dev" \ set -ex \ && apt-get -y update \ && /container/tool/add-multiple-process-stack \ From bff3876ba69e5cc2fffe02e58a6af8124f2ff366 Mon Sep 17 00:00:00 2001 From: Bertrand Gouny Date: Wed, 20 Mar 2019 12:47:15 +0100 Subject: [PATCH 3/3] v2.9.0 --- CHANGELOG.md | 5 +++++ README.md | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 627dc27..528840d 100644 --- 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.9.0] - 2019-02-20 +### Changed + - Upgrade Zammad version to 2.9.0 + ## [2.8.0] - 2019-01-21 ### Changed - Upgrade Zammad version to 2.8.0 @@ -43,6 +47,7 @@ and this project follows Zammad versioning. ## 2.0.0 - 2017-10-25 Initial release +[2.9.0]: https://github.com/osixia/docker-openldap/compare/v2.8.0...v2.9.0 [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 diff --git a/README.md b/README.md index b3eb9d3..dfdd880 100644 --- 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.9.0 - Zammad 2.8.0 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/zammad/)  +Latest release: 2.9.0 - Zammad 2.9.0 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/zammad/)  **A docker image to run Zammad.**