From efe03468f357f4f08335c61f869c53812a5223f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Sat, 14 Apr 2018 15:48:17 +0200 Subject: [PATCH 1/2] fix reindex if --- containers/zammad/docker-entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/containers/zammad/docker-entrypoint.sh b/containers/zammad/docker-entrypoint.sh index 5cf6edb..e2851d1 100644 --- a/containers/zammad/docker-entrypoint.sh +++ b/containers/zammad/docker-entrypoint.sh @@ -69,7 +69,7 @@ if [ "$1" = 'zammad-init' ]; then sleep 5 done - if [ -n "$(curl -s ${ELASTICSEARCH_HOST}:${ELASTICSEARCH_PORT}/_cat/indices |grep zammad)" ]; then + if [ -z "$(curl -s ${ELASTICSEARCH_HOST}:${ELASTICSEARCH_PORT}/_cat/indices |grep zammad)" ]; then echo "rebuilding es searchindex..." bundle exec rake searchindex:rebuild fi From 42a76b8752bdaaa0aa1a6ba07e51d1b948e83231 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Sat, 14 Apr 2018 16:28:30 +0200 Subject: [PATCH 2/2] update elasticsearch to 5.6.8 --- 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 c68953f..0febf09 100644 --- a/containers/zammad-elasticsearch/Dockerfile +++ b/containers/zammad-elasticsearch/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.elastic.co/elasticsearch/elasticsearch:5.6.5 +FROM docker.elastic.co/elasticsearch/elasticsearch:5.6.8 MAINTAINER Zammad ARG BUILD_DATE