From 09e1e6b2d720f76e3a41ea6b995e96581b33f7df Mon Sep 17 00:00:00 2001 From: Marcel Herrguth Date: Fri, 28 Jan 2022 21:44:56 +0100 Subject: [PATCH 1/2] Raise .env version to 5.0.3-14 to include ES 7.16.2 (#266) * Raise .env version to 5.0.3-14 to include ES 7.16.2 * Maintenance: Test raised linter version from 3 to 4 * Maintenance: Adjust readme according to linters complaints * Maintenance: Fix typos --- .env | 2 +- .github/workflows/ci.yaml | 2 +- README.md | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.env b/.env index a66c6d9..c43e3b0 100644 --- a/.env +++ b/.env @@ -5,4 +5,4 @@ POSTGRES_USER=zammad REDIS_URL=redis://zammad-redis:6379 RESTART=always # don't forget to add the minus before the version -VERSION=-5.0.3-7 +VERSION=-5.0.3-14 diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a38570f..9c019de 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -34,7 +34,7 @@ jobs: uses: actions/checkout@v2 - name: Lint Code Base - uses: github/super-linter@v3 + uses: github/super-linter@v4 env: DEFAULT_BRANCH: master GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/README.md b/README.md index 6844c51..39fb292 100644 --- a/README.md +++ b/README.md @@ -2,17 +2,17 @@ Zammad is a web based open source helpdesk/ticket system with many features to manage customer communication via several channels like telephone, facebook, -twitter, chat and e-mails. It is distributed under the GNU AFFERO General Public - License (AGPL). Do you receive many e-mails and want to answer them with a team of agents? +twitter, chat and emails. It is distributed under the GNU AFFERO General Public + License (AGPL). Do you receive many emails and want to answer them with a team of agents? You're going to love Zammad! -## Use case for this repo +## Use case for this repository -This repo is meant to be the starting point for somebody who likes to use dockerized multi-container Zammad in production. +This repository is meant to be the starting point for somebody who likes to use dockerized multi-container Zammad in production. ## Getting started with zammad-docker-compose - +[Learn more on Zammads documentation](https://docs.zammad.org/en/latest/install/docker-compose.html) ## CI Status From 6ae09345ad26cad0b3d7c78f3e9c8aee3ea96f19 Mon Sep 17 00:00:00 2001 From: pebosi Date: Fri, 28 Jan 2022 14:13:27 +0100 Subject: [PATCH 2/2] update to 7.16.3 including latest log4j release --- containers/zammad-elasticsearch/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/containers/zammad-elasticsearch/Dockerfile b/containers/zammad-elasticsearch/Dockerfile index b688f95..9df8767 100644 --- a/containers/zammad-elasticsearch/Dockerfile +++ b/containers/zammad-elasticsearch/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.elastic.co/elasticsearch/elasticsearch:7.16.2 +FROM docker.elastic.co/elasticsearch/elasticsearch:7.16.3 ARG BUILD_DATE LABEL org.label-schema.build-date="$BUILD_DATE" \