should fix #5

blacktop · Mar 3, 2018 · da9e072 · da9e072
1 parent 5515f9e
commit da9e072
Show file tree

Hide file tree

Showing 5 changed files with 158 additions and 220 deletions.
diff --git a/6.2/elastic-entrypoint.sh b/6.2/elastic-entrypoint.sh
@@ -2,95 +2,43 @@
 
 set -e
 
-es_opts=''
+umask 0002
+
+declare -a es_opts
 
 while IFS='=' read -r envvar_key envvar_value
 do
     # Elasticsearch env vars need to have at least two dot separated lowercase words, e.g. `cluster.name`
-    if [[ "$envvar_key" =~ ^[a-z]+\.[a-z]+ ]]
-    then
+    if [[ "$envvar_key" =~ ^[a-z0-9_]+\.[a-z0-9_]+ ]]; then
         if [[ ! -z $envvar_value ]]; then
           es_opt="-E${envvar_key}=${envvar_value}"
-          es_opts+=" ${es_opt}"
+          es_opts+=("${es_opt}")
         fi
     fi
 done < <(env)
 
 export ES_JAVA_OPTS="-Des.cgroups.hierarchy.override=/ $ES_JAVA_OPTS"
 
-# Add elasticsearch as command if needed
-if [ "${1:0:1}" = '-' ]; then
-	set -- elasticsearch "$@" ${es_opts}
-fi
-
-################################################
-# = MASTER NODE =                              #
-################################################
-if [ "$1" = 'master' -a "$(id -u)" = '0' ]; then
-	# Change node into a data node
-	CONFIG=/usr/share/elasticsearch/config/elasticsearch.yml
-	sed -ri "s!^(\#\s*)?(node\.master:).*!\2 'true'!" $CONFIG
-	sed -ri "s!^(\#\s*)?(node\.ingest:).*!\2 'false'!" $CONFIG
-	sed -ri "s!^(\#\s*)?(node\.data:).*!\2 'false'!" $CONFIG
-
-	# Change the ownership of user-mutable directories to elasticsearch
-	chown -R elasticsearch:elasticsearch /usr/share/elasticsearch/data
-	chown -R elasticsearch:elasticsearch /usr/share/elasticsearch/logs
-
-	set -- su-exec elasticsearch "$@" ${es_opts}
-fi
-
-################################################
-# = INGEST NODE =                              #
-################################################
-if [ "$1" = 'ingest' -a "$(id -u)" = '0' ]; then
-	# Change node into a data node
-	CONFIG=/usr/share/elasticsearch/config/elasticsearch.yml
-	sed -ri "s!^(\#\s*)?(node\.master:).*!\2 'false'!" $CONFIG
-	sed -ri "s!^(\#\s*)?(node\.ingest:).*!\2 'true'!" $CONFIG
-	sed -ri "s!^(\#\s*)?(node\.data:).*!\2 'false'!" $CONFIG
-	# Set master.node's name
-	if ! grep -q "discovery.zen.ping.unicast.hosts" $CONFIG; then
-		echo "discovery.zen.ping.unicast.hosts: [\"elastic-master\"]" >> $CONFIG
-	fi
-
-	# Change the ownership of user-mutable directories to elasticsearch
-	chown -R elasticsearch:elasticsearch /usr/share/elasticsearch/data
-	chown -R elasticsearch:elasticsearch /usr/share/elasticsearch/logs
-
-	set -- su-exec elasticsearch "$@" ${es_opts}
+# Determine if x-pack is enabled
+if bin/elasticsearch-plugin list -s | grep -q x-pack; then
+    if [[ -n "$ELASTIC_PASSWORD" ]]; then
+        [[ -f config/elasticsearch.keystore ]] ||  bin/elasticsearch-keystore create
+        echo "$ELASTIC_PASSWORD" | bin/elasticsearch-keystore add -x 'bootstrap.password'
+    fi
 fi
 
-################################################
-# = DATA NODE =                                #
-################################################
-if [ "$1" = 'data' -a "$(id -u)" = '0' ]; then
-	# Change node into a data node
-	CONFIG=/usr/share/elasticsearch/config/elasticsearch.yml
-	sed -ri "s!^(\#\s*)?(node\.master:).*!\2 'false'!" $CONFIG
-	sed -ri "s!^(\#\s*)?(node\.ingest:).*!\2 'false'!" $CONFIG
-	sed -ri "s!^(\#\s*)?(node\.data:).*!\2 'true'!" $CONFIG
-	# Set master.node's name
-	if ! grep -q "discovery.zen.ping.unicast.hosts" $CONFIG; then
-		echo "discovery.zen.ping.unicast.hosts: [\"elastic-master\"]" >> $CONFIG
-	fi
-
-	# Change the ownership of user-mutable directories to elasticsearch
-	chown -R elasticsearch:elasticsearch /usr/share/elasticsearch/data
-	chown -R elasticsearch:elasticsearch /usr/share/elasticsearch/logs
-
-	set -- su-exec elasticsearch "$@" ${es_opts}
-
+# Add elasticsearch as command if needed
+if [ "${1:0:1}" = '-' ]; then
+	set -- elasticsearch "$@"
 fi
 
 # Drop root privileges if we are running elasticsearch
 # allow the container to be started with `--user`
 if [ "$1" = 'elasticsearch' -a "$(id -u)" = '0' ]; then
 	# Change the ownership of user-mutable directories to elasticsearch
-	chown -R elasticsearch:elasticsearch /usr/share/elasticsearch/data
-	chown -R elasticsearch:elasticsearch /usr/share/elasticsearch/logs
+	chown -R elasticsearch:elasticsearch /usr/share/elasticsearch/{data,logs}
 
-	set -- su-exec elasticsearch "$@" ${es_opts}
+	set -- su-exec elasticsearch "$@" "${es_opts[@]}"
 fi
 
 exec "$@"
diff --git a/docker-compose.x-pack.yml b/docker-compose.x-pack.yml
@@ -0,0 +1,86 @@
+version: "3"
+
+services:
+  #############################
+  # ELASTICSEARCH MASTER NODE #
+  #############################
+  master:
+    restart: unless-stopped
+    image: blacktop/elasticsearch:x-pack
+    environment:
+      - ELASTIC_PASSWORD=pleasechangeme
+      - xpack.security.audit.enabled=true
+      - cluster.name=docker-cluster
+      - node.name=master-node
+      - node.master=true
+      - node.ingest=false
+      - node.data=false
+    volumes:
+      - data:/usr/share/elasticsearch/data
+    networks:
+      - elastic
+  ####################################
+  # ELASTICSEARCH CLIENT/INGEST NODE #
+  ####################################
+  ingest:
+    restart: unless-stopped
+    image: blacktop/elasticsearch:x-pack
+    environment:
+      - ELASTIC_PASSWORD=pleasechangeme
+      - xpack.security.audit.enabled=true
+      - cluster.name=docker-cluster
+      - node.name=ingest-node-1
+      - node.master=true
+      - node.ingest=true
+      - node.data=false
+      - discovery.zen.ping.unicast.hosts=master
+    ports:
+      - "9200:9200"
+    links:
+     - master:elastic-master
+    networks:
+      - elastic
+  ###########################
+  # ELASTICSEARCH DATA NODE #
+  ###########################
+  data:
+    restart: unless-stopped
+    image: blacktop/elasticsearch:x-pack
+    environment:
+      - ELASTIC_PASSWORD=pleasechangeme
+      - xpack.security.audit.enabled=true
+      - ES_JAVA_OPTS=-Xms2g -Xmx2g
+      - cluster.name=docker-cluster
+      - node.name=data-node-1
+      - node.master=false
+      - node.ingest=false
+      - node.data=true
+      - discovery.zen.ping.unicast.hosts=master
+    links:
+     - master:elastic-master
+    # volumes:
+    #   - data:/usr/share/elasticsearch/data
+    networks:
+      - elastic
+  ###############
+  # KIBANA NODE #
+  ###############
+  kibana:
+    image: blacktop/kibana:x-pack
+    ports:
+      - "80:5601"
+    links:
+     - ingest:elasticsearch
+    networks:
+      - elastic
+#############################
+# ELASTICSEARCH DATA VOLUME #
+#############################
+volumes:
+  data:
+################################
+# ELASTICSEARCH BRIDGE NETWORK #
+################################
+networks:
+  elastic:
+    driver: bridge
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,13 +1,18 @@
-version: "2"
+version: "3"
 
 services:
   #############################
   # ELASTICSEARCH MASTER NODE #
   #############################
   master:
     restart: unless-stopped
-    image: blacktop/elasticsearch:x-pack
-    command: master
+    image: blacktop/elasticsearch:6.2
+    environment:
+      - cluster.name=docker-cluster
+      - node.name=master-node
+      - node.master=true
+      - node.ingest=false
+      - node.data=false
     volumes:
       - data:/usr/share/elasticsearch/data
     networks:
@@ -17,8 +22,14 @@ services:
   ####################################
   ingest:
     restart: unless-stopped
-    image: blacktop/elasticsearch:x-pack
-    command: ingest
+    image: blacktop/elasticsearch:6.2
+    environment:
+      - cluster.name=docker-cluster
+      - node.name=ingest-node-1
+      - node.master=true
+      - node.ingest=true
+      - node.data=false
+      - discovery.zen.ping.unicast.hosts=master
     ports:
       - "9200:9200"
     links:
@@ -30,10 +41,15 @@ services:
   ###########################
   data:
     restart: unless-stopped
-    image: blacktop/elasticsearch:x-pack
+    image: blacktop/elasticsearch:6.2
     environment:
       - ES_JAVA_OPTS=-Xms2g -Xmx2g
-    command: data
+      - cluster.name=docker-cluster
+      - node.name=data-node-1
+      - node.master=false
+      - node.ingest=false
+      - node.data=true
+      - discovery.zen.ping.unicast.hosts=master
     links:
      - master:elastic-master
     # volumes:
@@ -44,7 +60,7 @@ services:
   # KIBANA NODE #
   ###############
   kibana:
-    image: blacktop/kibana:x-pack
+    image: blacktop/kibana:6.2
     ports:
       - "80:5601"
     links:

diff --git a/geoip/elastic-entrypoint.sh b/geoip/elastic-entrypoint.sh
@@ -2,95 +2,43 @@
 
 set -e
 
-es_opts=''
+umask 0002
+
+declare -a es_opts
 
 while IFS='=' read -r envvar_key envvar_value
 do
     # Elasticsearch env vars need to have at least two dot separated lowercase words, e.g. `cluster.name`
-    if [[ "$envvar_key" =~ ^[a-z]+\.[a-z]+ ]]
-    then
+    if [[ "$envvar_key" =~ ^[a-z0-9_]+\.[a-z0-9_]+ ]]; then
         if [[ ! -z $envvar_value ]]; then
           es_opt="-E${envvar_key}=${envvar_value}"
-          es_opts+=" ${es_opt}"
+          es_opts+=("${es_opt}")
         fi
     fi
 done < <(env)
 
 export ES_JAVA_OPTS="-Des.cgroups.hierarchy.override=/ $ES_JAVA_OPTS"
 
-# Add elasticsearch as command if needed
-if [ "${1:0:1}" = '-' ]; then
-	set -- elasticsearch "$@" ${es_opts}
-fi
-
-################################################
-# = MASTER NODE =                              #
-################################################
-if [ "$1" = 'master' -a "$(id -u)" = '0' ]; then
-	# Change node into a data node
-	CONFIG=/usr/share/elasticsearch/config/elasticsearch.yml
-	sed -ri "s!^(\#\s*)?(node\.master:).*!\2 'true'!" $CONFIG
-	sed -ri "s!^(\#\s*)?(node\.ingest:).*!\2 'false'!" $CONFIG
-	sed -ri "s!^(\#\s*)?(node\.data:).*!\2 'false'!" $CONFIG
-
-	# Change the ownership of user-mutable directories to elasticsearch
-	chown -R elasticsearch:elasticsearch /usr/share/elasticsearch/data
-	chown -R elasticsearch:elasticsearch /usr/share/elasticsearch/logs
-
-	set -- su-exec elasticsearch "$@" ${es_opts}
-fi
-
-################################################
-# = INGEST NODE =                              #
-################################################
-if [ "$1" = 'ingest' -a "$(id -u)" = '0' ]; then
-	# Change node into a data node
-	CONFIG=/usr/share/elasticsearch/config/elasticsearch.yml
-	sed -ri "s!^(\#\s*)?(node\.master:).*!\2 'false'!" $CONFIG
-	sed -ri "s!^(\#\s*)?(node\.ingest:).*!\2 'true'!" $CONFIG
-	sed -ri "s!^(\#\s*)?(node\.data:).*!\2 'false'!" $CONFIG
-	# Set master.node's name
-	if ! grep -q "discovery.zen.ping.unicast.hosts" $CONFIG; then
-		echo "discovery.zen.ping.unicast.hosts: [\"elastic-master\"]" >> $CONFIG
-	fi
-
-	# Change the ownership of user-mutable directories to elasticsearch
-	chown -R elasticsearch:elasticsearch /usr/share/elasticsearch/data
-	chown -R elasticsearch:elasticsearch /usr/share/elasticsearch/logs
-
-	set -- su-exec elasticsearch "$@" ${es_opts}
+# Determine if x-pack is enabled
+if bin/elasticsearch-plugin list -s | grep -q x-pack; then
+    if [[ -n "$ELASTIC_PASSWORD" ]]; then
+        [[ -f config/elasticsearch.keystore ]] ||  bin/elasticsearch-keystore create
+        echo "$ELASTIC_PASSWORD" | bin/elasticsearch-keystore add -x 'bootstrap.password'
+    fi
 fi
 
-################################################
-# = DATA NODE =                                #
-################################################
-if [ "$1" = 'data' -a "$(id -u)" = '0' ]; then
-	# Change node into a data node
-	CONFIG=/usr/share/elasticsearch/config/elasticsearch.yml
-	sed -ri "s!^(\#\s*)?(node\.master:).*!\2 'false'!" $CONFIG
-	sed -ri "s!^(\#\s*)?(node\.ingest:).*!\2 'false'!" $CONFIG
-	sed -ri "s!^(\#\s*)?(node\.data:).*!\2 'true'!" $CONFIG
-	# Set master.node's name
-	if ! grep -q "discovery.zen.ping.unicast.hosts" $CONFIG; then
-		echo "discovery.zen.ping.unicast.hosts: [\"elastic-master\"]" >> $CONFIG
-	fi
-
-	# Change the ownership of user-mutable directories to elasticsearch
-	chown -R elasticsearch:elasticsearch /usr/share/elasticsearch/data
-	chown -R elasticsearch:elasticsearch /usr/share/elasticsearch/logs
-
-	set -- su-exec elasticsearch "$@" ${es_opts}
-
+# Add elasticsearch as command if needed
+if [ "${1:0:1}" = '-' ]; then
+	set -- elasticsearch "$@"
 fi
 
 # Drop root privileges if we are running elasticsearch
 # allow the container to be started with `--user`
 if [ "$1" = 'elasticsearch' -a "$(id -u)" = '0' ]; then
 	# Change the ownership of user-mutable directories to elasticsearch
-	chown -R elasticsearch:elasticsearch /usr/share/elasticsearch/data
-	chown -R elasticsearch:elasticsearch /usr/share/elasticsearch/logs
+	chown -R elasticsearch:elasticsearch /usr/share/elasticsearch/{data,logs}
 
-	set -- su-exec elasticsearch "$@" ${es_opts}
+	set -- su-exec elasticsearch "$@" "${es_opts[@]}"
 fi
 
 exec "$@"