Configuration is now powered by environment variables.

Upgraded to Kubernetes discovery plug-in 1.3.0.
Fixes #1

Author: pires

Dockerfile

@@ -1,9 +1,12 @@
-FROM quay.io/pires/docker-elasticsearch:1.7.1
+FROM quay.io/pires/docker-elasticsearch:1.7.1-2
 
 MAINTAINER [email protected]
 
 # Override elasticsearch.yml config, otherwise plug-in install will fail
-ADD elasticsearch.yml /elasticsearch/config/elasticsearch.yml
+ADD do_not_use.yml /elasticsearch/config/elasticsearch.yml
 
 # Install Elasticsearch plug-ins
-RUN /elasticsearch/bin/plugin -i io.fabric8/elasticsearch-cloud-kubernetes/1.2.1 --verbose
+RUN /elasticsearch/bin/plugin -i io.fabric8/elasticsearch-cloud-kubernetes/1.3.0 --verbose
+
+# Override elasticsearch.yml config, otherwise plug-in install will fail
+ADD elasticsearch.yml /elasticsearch/config/elasticsearch.yml

README.md

@@ -1,27 +1,19 @@
 # docker-elasticsearch-kubernetes
-Ready to use Elasticsearch + Kubernetes discovery plug-in Docker image.
+
+Ready to use lean (210MB) Elasticsearch Docker image ready for using within a Kubernetes cluster.
 
 [![Docker Repository on Quay.io](https://quay.io/repository/pires/docker-elasticsearch-kubernetes/status "Docker Repository on Quay.io")](https://quay.io/repository/pires/docker-elasticsearch-kubernetes)
 
 ## Current software
 
 * Oracle JRE 8 Update 51
 * Elasticsearch 1.7.1
-* Kubernetes plug-in 1.2.1
+* Kubernetes plug-in 1.3.0
 
 ## Pre-requisites
 
-* Docker 1.5.0+
+* Docker 1.7.0+
 
 ## Run
 
-You need a folder named `config` with your own version of `elasticsearch.yml`. You can add other Elasticserach configuration files to this folder, such as `logging.yml`.
-
-```
-docker run --rm -v /path/to/config:/elasticsearch/config quay.io/pires/docker-elasticsearch-kubernetes:1.7.1
-```
-
-In case you want to specify a data folder so that Elasticsearch writes to storage outside the container, run
-```
-docker run --rm -v /path/to/config:/elasticsearch/config -v /path/to/data_folder:/data quay.io/pires/docker-elasticsearch-kubernetes:1.7.1
-```
+See [pires/kubernetes-elasticsearch-cluster](https://github.com/pires/kubernetes-elasticsearch-cluster) for instructions on how to run, scale and use Elasticsearch on Kubernetes.

do_not_use.yml

@@ -0,0 +1,2 @@
+path:
+  plugins: /elasticsearch/plugins

elasticsearch.yml

@@ -1,2 +1,24 @@
+cluster:
+  name: ${CLUSTER_NAME}
+  
+node:
+  master: ${NODE_MASTER}
+  data: ${NODE_DATA}
+
 path:
+  data: /data/data
+  logs: /data/log
   plugins: /elasticsearch/plugins
+  work: /data/work
+
+bootstrap.mlockall: true
+
+http.enabled: ${HTTP_ENABLE}
+
+cloud:
+  k8s:
+    service: ${DISCOVERY_SERVICE}
+    namespace: ${NAMESPACE}
+discovery:
+  type: io.fabric8.elasticsearch.discovery.k8s.K8sDiscoveryModule
+  zen.ping.multicast.enabled: false

run.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+export CLUSTER_NAME=${CLUSTER_NAME:-elasticsearch-default}
+export NODE_MASTER=${NODE_MASTER:-true}
+export NODE_DATA=${NODE_DATA:-true}
+export HTTP_ENABLE=${HTTP_ENABLE:-true}
+export MULTICAST=${MULTICAST:-true}
+
+export NAMESPACE=${NAMESPACE:-default}
+export DISCOVERY_SERVICE=${DISCOVERY_SERVICE:-elasticsearch-discovery}
+
+/elasticsearch/bin/elasticsearch