Skip to content

Commit

Permalink
Merge branch 'release-2.9.0' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
BertrandGouny committed Mar 20, 2019
2 parents bb4cd9e + bff3876 commit 85d46f7
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 7 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
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/zammad
VERSION = 2.8.0
VERSION = 2.9.0

.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/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.9.0 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/zammad/) 

**A docker image to run Zammad.**

Expand Down
2 changes: 1 addition & 1 deletion example/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion example/kubernetes/zammad-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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 \
Expand Down

0 comments on commit 85d46f7

Please sign in to comment.