fixed es restarting always issue after restart es

easonlau02 · Apr 23, 2018 · 71a1ece · 71a1ece
1 parent aa009d6
commit 71a1ece
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/6.0.0/elasticsearch/docker-entrypoint.sh b/6.0.0/elasticsearch/docker-entrypoint.sh
@@ -14,7 +14,11 @@ if [ "$1" = 'elasticsearch' -a "$(id -u)" = '0' ]; then
         chown -R elasticsearch:elasticsearch /usr/share/elasticsearch/data
         chown -R elasticsearch:elasticsearch /usr/share/elasticsearch/logs
         chown -R elasticsearch:elasticsearch /usr/share/elasticsearch/etc/sysconfig/elasticsearch
-        ln -s /usr/share/elasticsearch/etc/sysconfig/elasticsearch /etc/sysconfig/
+        if [ ! -h /etc/sysconfig/elasticsearch ]; then
+		ln -s /usr/share/elasticsearch/etc/sysconfig/elasticsearch /etc/sysconfig/
+	else
+		echo "Soft link /etc/sysconfig/elasticsearch exists!"
+	fi
 
         set -- gosu elasticsearch "$@"
         #exec gosu elasticsearch "$BASH_SOURCE" "$@"

diff --git a/6.1.2/elasticsearch/docker-entrypoint.sh b/6.1.2/elasticsearch/docker-entrypoint.sh
@@ -14,7 +14,11 @@ if [ "$1" = 'elasticsearch' -a "$(id -u)" = '0' ]; then
         chown -R elasticsearch:elasticsearch /usr/share/elasticsearch/data
         chown -R elasticsearch:elasticsearch /usr/share/elasticsearch/logs
         chown -R elasticsearch:elasticsearch /usr/share/elasticsearch/etc/sysconfig/elasticsearch
-        ln -s /usr/share/elasticsearch/etc/sysconfig/elasticsearch /etc/sysconfig/
+        if [ ! -h /etc/sysconfig/elasticsearch ]; then
+		ln -s /usr/share/elasticsearch/etc/sysconfig/elasticsearch /etc/sysconfig/
+        else
+		echo "Soft link /etc/sysconfig/elasticsearh exists."
+	fi
 
         set -- gosu elasticsearch "$@"
         #exec gosu elasticsearch "$BASH_SOURCE" "$@"