Merge branch 'release-3.1.0' into stable

CHANGELOG.md

@@ -4,6 +4,12 @@ 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.
 
+## [3.1.0] - 2019-10-11
+### Changed
+  - Upgrade Zammad version to 3.1.0 (osixia chat-no-jquery fix version)
+  - Upgrade baseimage to ruby:2.5.5-slim-stretch
+  - Upgrade GOSU to 1.11
+
 ## [3.0.0] - 2019-06-10
 ### Changed
   - Upgrade Zammad version to 3.0.0
@@ -54,6 +60,7 @@ and this project follows Zammad versioning.
 ## 2.0.0 - 2017-10-25
 Initial release
 
+[3.1.0]: https://github.com/osixia/docker-openldap/compare/v2.9.0...v3.1.0
 [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

Makefile

@@ -1,5 +1,5 @@
 NAME = osixia/zammad
-VERSION = 3.0.0
+VERSION = 3.1.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: 3.0.0 - Zammad 3.0.0 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/zammad/) 
+Latest release: 3.1.0 - Zammad 3.1.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:3.0.0
+    image: osixia/zammad:3.1.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:3.0.0
+          image: osixia/zammad:3.1.0
           imagePullPolicy: Always
           resources:
             requests:

image/Dockerfile

@@ -1,13 +1,13 @@
-FROM ruby:2.4.4-slim-stretch
+FROM ruby:2.5.5-slim-stretch
 
 ENV ZAMMAD_DIR /home/zammad
 ENV ZAMMAD_USER zammad
 ENV RAILS_ENV production
 
-ARG ZAMMAD_VERSION=3.0.0
-ARG ZAMMAD_MD5=5170cfc115ee90e853c1180578fc30da
+# ARG ZAMMAD_VERSION=3.1.0
+# ARG ZAMMAD_MD5=64ea8a6c3b6c630f0fddc6b4711c46a1
 
-ARG GOSU_VERSION=1.10
+ARG GOSU_VERSION=1.11
 
 ARG LIGHT_BASEIMAGE_VERSION=1.1.1
 ARG WEB_BASEIMAGE_VERSION=1.1.0
@@ -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 libimlib2 libimlib2-dev" \
+RUN BUILD_DEPENDENCIES="git patch build-essential libffi-dev libpq5 libpq-dev libimlib2 libimlib2-dev" \
     set -ex \
     && apt-get -y update \
     && /container/tool/add-multiple-process-stack \
@@ -60,13 +60,20 @@ RUN BUILD_DEPENDENCIES="git build-essential libffi-dev libpq5 libpq-dev libimlib
     && mkdir -p ${ZAMMAD_DIR} \
     && useradd -M -d ${ZAMMAD_DIR} -s /bin/bash ${ZAMMAD_USER} \
     && cd ${ZAMMAD_DIR} \
-    && curl -L -o zammad.tar.gz https://ftp.zammad.com/zammad-${ZAMMAD_VERSION}.tar.gz \
-    && [ $(md5sum zammad.tar.gz | awk '{ print $1 }') = "${ZAMMAD_MD5}" ] \
+    && curl -L -o zammad.tar.gz https://github.com/osixia/zammad/releases/download/3.1.0/zammad-fixed.tar.gz \
+    # && curl -L -o zammad.tar.gz https://ftp.zammad.com/zammad-${ZAMMAD_VERSION}.tar.gz \
+    # && [ $(md5sum zammad.tar.gz | awk '{ print $1 }') = "${ZAMMAD_MD5}" ] \
     && tar -zxf zammad.tar.gz \
     && rm -rf zammad.tar.gz \
     && bundle install --without test development postgres \
     && contrib/packager.io/fetch_locales.rb \
+    && curl -L -o zammad.patch https://github.com/zammad/zammad/commit/3f20b05469adaa35dbb4a7e16c24f3fd7a6358ed.patch \
+    && cd ${ZAMMAD_DIR} && patch -p1 -d ${ZAMMAD_DIR} < zammad.patch \
     && sed -e 's#.*adapter: postgresql#  adapter: nulldb#g' < contrib/packager.io/database.yml.pkgr > config/database.yml \
+    && sed -i "/require 'rails\/all'/a require\ 'nulldb'" config/application.rb \
+    && sed -i '/# Use a different logger for distributed setups./a \ \ config.logger = Logger.new(STDOUT)' config/environments/production.rb \
+    && sed -i 's/.*scheduler_\(err\|out\).log.*//g' script/scheduler.rb \
+    && touch db/schema.rb \
     && 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' < contrib/packager.io/database.yml.pkgr > config/database.yml \
     && rm -r tmp/cache \