Merge branch 'release-2.2.0' into stable

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 2.2.0
+  - Zammad 2.2.0
+  - Add memcached
+  - Add ZAMMAD_ELASTICSEARCH_USER and ZAMMAD_ELASTICSEARCH_PASS environment variables
+
 ## 2.1.0
   - Zammad 2.1.0
 

Makefile

@@ -1,5 +1,5 @@
 NAME = osixia/zammad
-VERSION = 2.1.0
+VERSION = 2.2.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: 2.1.0 - Zammad 2.1.0 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/zammad/) 
+Latest release: 2.2.0 - Zammad 2.2.0 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/zammad/) 
 
 **A docker image to run Zammad.**
 

example/docker-compose.yml

@@ -11,6 +11,13 @@ services:
     volumes:
       - elasticsearch:/usr/share/elasticsearch/data
 
+  memcached:
+    command: ["zammad-memcached"]
+    image: zammad/zammad-docker-compose:zammad-memcached
+    labels:
+      io.rancher.container.pull_image: always
+    restart: always
+
   mariadb:
     image: osixia/mariadb:10.2.8
     labels:
@@ -25,8 +32,8 @@ services:
       - mariadb:/var/lib/mysql
 
   zammad:
-    image: osixia/zammad:2.1.0
-    command: -l trace
+    image: osixia/zammad:2.2.0
+    command: -l info
     labels:
       - "io.rancher.container.pull_image: always"
       - "traefik.protocol=https"
@@ -35,6 +42,7 @@ services:
     links:
       - elasticsearch
       - mariadb
+      - memcached
     ports:
       - "6443:443"
     restart: always
@@ -44,6 +52,7 @@ services:
       ZAMMAD_DB_USER: "zammad"
       ZAMMAD_DB_PASSWORD: "zammad"
       ZAMMAD_ELASTICSEARCH_URL: "http://elasticsearch:9200"
+      ZAMMAD_MEMCACHED_HOST: memcached
     volumes:
       - zammad-backup:/data/backup
 

example/kubernetes/elasticsearch-deployment.yaml

@@ -42,6 +42,7 @@ spec:
             memory: 1024Mi
           limits:
             memory: 1024Mi
+        terminationGracePeriodSeconds: 10
         env:
         #- name: "bootstrap.memory_lock" should be fixed in next major kubernetes release
         #  value: "true"
@@ -54,6 +55,18 @@ spec:
         volumeMounts:
         - name: elasticsearch-data
           mountPath: /usr/share/elasticsearch/data
+        readinessProbe:
+          httpGet:
+            path: /_cluster/health?local=true
+            port: 9200
+          initialDelaySeconds: 60
+          periodSeconds: 10
+        livenessProbe:
+          httpGet:
+            path: /_cluster/health?local=true
+            port: 9200
+          initialDelaySeconds: 60
+          periodSeconds: 10
       volumes:
         - name: "elasticsearch-data"
           emptyDir: {} # change me to persistent storage

example/kubernetes/memcached-deployment.yaml

@@ -0,0 +1,35 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: memcached
+  namespace: default
+  labels:
+    app: memcached
+spec:
+  replicas: 1
+  revisionHistoryLimit: 1
+  template:
+    metadata:
+      labels:
+        app: memcached
+    spec:
+      terminationGracePeriodSeconds: 10
+
+      containers:
+      - name: memcached
+        image: zammad/zammad-docker-compose:zammad-memcached
+        args: [ "zammad-memcached" ]
+        ports:
+        - containerPort: 11211
+          name: memcached
+        imagePullPolicy: Always
+        readinessProbe:
+          tcpSocket:
+            port: 11211
+          initialDelaySeconds: 20
+          periodSeconds: 10
+        livenessProbe:
+          tcpSocket:
+            port: 11211
+          initialDelaySeconds: 10
+          periodSeconds: 10

example/kubernetes/memcached-service.yaml

@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: memcached
+  namespace: default
+  labels:
+    app: memcached
+spec:
+  ports:
+    - port: 11211
+  selector:
+    app: memcached

example/kubernetes/zammad-deployment.yaml

@@ -15,7 +15,7 @@ spec:
       automountServiceAccountToken: false
       containers:
         - name: zammad
-          image: osixia/zammad:2.1.0
+          image: osixia/zammad:2.2.0
           imagePullPolicy: Always
           resources:
             requests:
@@ -28,6 +28,8 @@ spec:
           env:
             - name: ZAMMAD_ELASTICSEARCH_URL
               value: "http://elasticsearch:9200"
+            - name: ZAMMAD_MEMCACHED_HOST
+              value: "memcached"
             - name: ZAMMAD_DB_HOST
               value: "mariadb"
             - name: ZAMMAD_DB_NAME

image/Dockerfile

@@ -4,10 +4,9 @@ MAINTAINER Bertrand Gouny <[email protected]>
 ENV ZAMMAD_DIR /home/zammad
 ENV ZAMMAD_USER zammad
 ENV RAILS_ENV production
-ENV RAILS_SERVER puma
 
-ARG ZAMMAD_VERSION=2.1.0
-ARG ZAMMAD_MD5=afc7471fef4214bfec638c65d37a58d1
+ARG ZAMMAD_VERSION=2.2.0
+ARG ZAMMAD_MD5=d3657d09d8f7cbfc3e37bf8f8d4d82c6
 
 ARG GOSU_VERSION=1.10
 

image/environment/default.yaml

@@ -5,6 +5,10 @@ ZAMMAD_DB_USER: zammad
 ZAMMAD_DB_PASSWORD: zammad
 
 ZAMMAD_ELASTICSEARCH_URL:
+ZAMMAD_ELASTICSEARCH_USER:
+ZAMMAD_ELASTICSEARCH_PASS:
+
+ZAMMAD_MEMCACHED_HOST:
 
 ZAMMAD_SSL_CRT_FILENAME: cert.crt
 ZAMMAD_SSL_KEY_FILENAME: cert.key

image/service/railsserver/process.sh

@@ -5,9 +5,4 @@
 log-helper level eq trace && set -x
 
 cd ${ZAMMAD_DIR}
-
-if [ "${RAILS_SERVER}" == "puma" ]; then
-  exec gosu ${ZAMMAD_USER}:${ZAMMAD_USER} bundle exec puma -b tcp://127.0.0.1:3000 -e ${RAILS_ENV}
-elif [ "${RAILS_SERVER}" == "unicorn" ]; then
-  exec gosu ${ZAMMAD_USER}:${ZAMMAD_USER} bundle exec unicorn -b 127.0.0.1 -p 3000 -c config/unicorn.rb -E ${RAILS_ENV}
-fi
+exec gosu ${ZAMMAD_USER}:${ZAMMAD_USER} bundle exec rails server puma -b 127.0.0.1 -p 3000 -e ${RAILS_ENV}

image/service/railsserver/startup.sh

@@ -10,6 +10,11 @@ if [ ! -e "$FIRST_START_DONE" ]; then
 
   cd ${ZAMMAD_DIR}
 
+  if [ -n "${ZAMMAD_MEMCACHED_HOST}" ]; then
+    log-helper info "Memcached config..."
+    sed -i -e "s/.*config.cache_store.*file_store.*cache_file_store.*/    config.cache_store = :dalli_store, '${ZAMMAD_MEMCACHED_HOST}:11211'\n    config.session_store = :dalli_store, '${ZAMMAD_MEMCACHED_HOST}:11211'/" ${ZAMMAD_DIR}/config/application.rb
+  fi
+
   log-helper info "Database config..."
   # make substitutions
   TO_REPLACE=(
@@ -52,6 +57,12 @@ if [ ! -e "$FIRST_START_DONE" ]; then
 
   log-helper info "Elasticsearch config..."
   bundle exec rails r "Setting.set('es_url', '${ZAMMAD_ELASTICSEARCH_URL}')"
+
+  if [ -n "${ZAMMAD_ELASTICSEARCH_USER}" ] && [ -n "${ZAMMAD_ELASTICSEARCH_PASS}" ]; then
+    bundle exec rails r "Setting.set('es_user', \"${ZAMMAD_ELASTICSEARCH_USER}\")"
+    bundle exec rails r "Setting.set('es_password', \"${ZAMMAD_ELASTICSEARCH_PASS}\")"
+  fi
+
   bundle exec rake searchindex:rebuild || true
 
   log-helper info "Fix file ownership..."