Freifunk-Rhein-Sieg/zammad-docker-compose
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
André Bauer 2018-04-14 18:15:40 +02:00
commit 03f2bd9955
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
containers/zammad-elasticsearch/Dockerfile
View File

@ -1,4 +1,4 @@
FROM docker.elastic.co/elasticsearch/elasticsearch:5.6.5
FROM docker.elastic.co/elasticsearch/elasticsearch:5.6.8
MAINTAINER Zammad <info@zammad.org>
ARG BUILD_DATE

2
containers/zammad/docker-entrypoint.sh
View File

@ -75,7 +75,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