Merge branch 'release-2.5.0' into stable

osixia · Jul 28, 2018 · e30f554 · e30f554
2 parents c105d44 + 408f567
commit e30f554
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 11 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.5.0] - 2018-07-28
+### Changed
+  - Upgrade Zammad version to 2.5.0
+
 ## [2.4.0] - 2018-03-30
 ### Changed
   - Upgrade Zammad version to 2.4.0
@@ -27,6 +31,7 @@ and this project follows Zammad versioning.
 ## 2.0.0 - 2017-10-25
 Initial release
 
+[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
 [2.2.0]: https://github.com/osixia/docker-openldap/compare/v2.1.0...v2.2.0

diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 NAME = osixia/zammad
-VERSION = 2.4.0
+VERSION = 2.5.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.4.0 - Zammad 2.4.0 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/zammad/) 
+Latest release: 2.5.0 - Zammad 2.5.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.4.0
+    image: osixia/zammad:2.5.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.4.0
+          image: osixia/zammad:2.5.0
           imagePullPolicy: Always
           resources:
             requests:

diff --git a/image/Dockerfile b/image/Dockerfile
@@ -1,12 +1,11 @@
-FROM ruby:2.4.2-slim-stretch
-MAINTAINER Bertrand Gouny <bertrand.gouny@osixia.net>
+FROM ruby:2.4.4-slim-stretch
 
 ENV ZAMMAD_DIR /home/zammad
 ENV ZAMMAD_USER zammad
 ENV RAILS_ENV production
 
-ARG ZAMMAD_VERSION=2.4.0
-ARG ZAMMAD_MD5=97deaaa33b96a1d8a356e102e493ad2a
+ARG ZAMMAD_VERSION=2.5.0
+ARG ZAMMAD_MD5=ec239101243ab068dec361368ca1262a
 
 ARG GOSU_VERSION=1.10
 
@@ -53,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 --recv-keys --keyserver ha.pool.sks-keyservers.net 0xB42F6819007F00F88E364FD4036A9C25BF357DD4 \
+	  && gpg --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 \
@@ -67,9 +66,9 @@ RUN BUILD_DEPENDENCIES="git build-essential libffi-dev libpq5 libpq-dev" \
     && rm -rf zammad.tar.gz \
     && bundle install --without test development postgres \
     && contrib/packager.io/fetch_locales.rb \
-    && sed -e 's#.*adapter: postgresql#  adapter: nulldb#g' < config/database.yml.pkgr > config/database.yml \
+    && sed -e 's#.*adapter: postgresql#  adapter: nulldb#g' < contrib/packager.io/database.yml.pkgr > config/database.yml \
     && bundle exec rake assets:precompile \
-    && sed -e 's#.*adapter: postgresql#  adapter: mysql2#g' -e 's#.*database:.*#  database: {{ ZAMMAD_DB_NAME }}#g'  -e 's#.*username:.*#  username: {{ ZAMMAD_DB_USER }}#g' -e 's#.*password:.*#  password: {{ ZAMMAD_DB_PASSWORD }}\n  host: {{ ZAMMAD_DB_HOST }}\n#g' < config/database.yml.pkgr > config/database.yml \
+    && sed -e 's#.*adapter: postgresql#  adapter: mysql2#g' -e 's#.*database:.*#  database: {{ ZAMMAD_DB_NAME }}#g'  -e 's#.*username:.*#  username: {{ ZAMMAD_DB_USER }}#g' -e 's#.*password:.*#  password: {{ ZAMMAD_DB_PASSWORD }}\n  host: {{ ZAMMAD_DB_HOST }}\n#g' < contrib/packager.io/database.yml.pkgr > config/database.yml \
     && rm -r tmp/cache \
     && chown -R ${ZAMMAD_USER}:${ZAMMAD_USER} ${ZAMMAD_DIR}