From 9842a689e4475defaa8268e40700f531f48c6ed8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Sat, 27 Nov 2021 01:55:12 +0100 Subject: [PATCH 1/5] Update .env (#257) --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index 1b6dd72..82c469d 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.2-1 +VERSION=-5.0.2-30 From efbe6664297ddc9dd922ff5ac2c3134ab3efc731 Mon Sep 17 00:00:00 2001 From: Martin Gruner Date: Tue, 7 Dec 2021 12:39:46 +0100 Subject: [PATCH 2/5] Maintenance: Update image to the new 5.0.3 release. (#259) --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index 82c469d..e74ac13 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.2-30 +VERSION=-5.0.3-1 From 17c5d209bdc8cfe0a214738a16a2bdc74292963b Mon Sep 17 00:00:00 2001 From: Marcel Herrguth Date: Tue, 14 Dec 2021 10:24:59 +0100 Subject: [PATCH 3/5] Maintenance: Raise Elasticsearch version to 7.16.1 to mitgitate log4j (#262) --- 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 e2e3cd4..47088b5 100644 --- a/containers/zammad-elasticsearch/Dockerfile +++ b/containers/zammad-elasticsearch/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.elastic.co/elasticsearch/elasticsearch:7.15.1 +FROM docker.elastic.co/elasticsearch/elasticsearch:7.16.1 ARG BUILD_DATE LABEL org.label-schema.build-date="$BUILD_DATE" \ From e697dcd4931537c63aa6d35d304cda710883ed41 Mon Sep 17 00:00:00 2001 From: Marcel Herrguth Date: Tue, 14 Dec 2021 11:29:26 +0100 Subject: [PATCH 4/5] Bump compose-Version (#263) * Maintenance: Raise schema version from 5.0.1 to 5.0.3 * Closes #262 - Raise default tag version to 5.0.3-7 Contains ES 7.16.1 --- .env | 2 +- Dockerfile | 2 +- containers/zammad-elasticsearch/Dockerfile | 2 +- containers/zammad-postgresql/Dockerfile | 2 +- containers/zammad/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.env b/.env index e74ac13..a66c6d9 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-1 +VERSION=-5.0.3-7 diff --git a/Dockerfile b/Dockerfile index 733cba4..edb13ac 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,5 +8,5 @@ LABEL org.label-schema.build-date="$BUILD_DATE" \ org.label-schema.vcs-url="https://github.com/zammad/zammad" \ org.label-schema.vcs-type="Git" \ org.label-schema.vendor="Zammad" \ - org.label-schema.schema-version="5.0.1" \ + org.label-schema.schema-version="5.0.3" \ org.label-schema.docker.cmd="sysctl -w vm.max_map_count=262144;docker-compose up" diff --git a/containers/zammad-elasticsearch/Dockerfile b/containers/zammad-elasticsearch/Dockerfile index 47088b5..e8aac4a 100644 --- a/containers/zammad-elasticsearch/Dockerfile +++ b/containers/zammad-elasticsearch/Dockerfile @@ -9,7 +9,7 @@ LABEL org.label-schema.build-date="$BUILD_DATE" \ org.label-schema.vcs-url="https://github.com/zammad/zammad" \ org.label-schema.vcs-type="Git" \ org.label-schema.vendor="Zammad" \ - org.label-schema.schema-version="5.0.1" \ + org.label-schema.schema-version="5.0.3" \ org.label-schema.docker.cmd="sysctl -w vm.max_map_count=262144;docker-compose up" SHELL ["/bin/bash", "-e", "-o", "pipefail", "-c"] diff --git a/containers/zammad-postgresql/Dockerfile b/containers/zammad-postgresql/Dockerfile index b931722..4d378b4 100644 --- a/containers/zammad-postgresql/Dockerfile +++ b/containers/zammad-postgresql/Dockerfile @@ -10,7 +10,7 @@ LABEL org.label-schema.build-date="$BUILD_DATE" \ org.label-schema.vcs-url="https://github.com/zammad/zammad" \ org.label-schema.vcs-type="Git" \ org.label-schema.vendor="Zammad" \ - org.label-schema.schema-version="5.0.1" \ + org.label-schema.schema-version="5.0.3" \ org.label-schema.docker.cmd="sysctl -w vm.max_map_count=262144;docker-compose up" SHELL ["/bin/bash", "-e", "-o", "pipefail", "-c"] diff --git a/containers/zammad/Dockerfile b/containers/zammad/Dockerfile index 173c6f1..0ab83e1 100644 --- a/containers/zammad/Dockerfile +++ b/containers/zammad/Dockerfile @@ -37,7 +37,7 @@ LABEL org.label-schema.build-date="$BUILD_DATE" \ org.label-schema.vcs-url="https://github.com/zammad/zammad" \ org.label-schema.vcs-type="Git" \ org.label-schema.vendor="Zammad" \ - org.label-schema.schema-version="5.0.1" \ + org.label-schema.schema-version="5.0.3" \ org.label-schema.docker.cmd="sysctl -w vm.max_map_count=262144;docker-compose up" ENV GIT_BRANCH stable From 7a0ba8ce35dda9a05e5aa2ef82fc6f011c563d06 Mon Sep 17 00:00:00 2001 From: TuringTux <53300311+TuringTux@users.noreply.github.com> Date: Mon, 20 Dec 2021 12:36:56 +0100 Subject: [PATCH 5/5] Use latest elasticsearch version --- 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 e8aac4a..b688f95 100644 --- a/containers/zammad-elasticsearch/Dockerfile +++ b/containers/zammad-elasticsearch/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.elastic.co/elasticsearch/elasticsearch:7.16.1 +FROM docker.elastic.co/elasticsearch/elasticsearch:7.16.2 ARG BUILD_DATE LABEL org.label-schema.build-date="$BUILD_DATE" \