Repository: incubator-senssoft Updated Branches: refs/heads/kubernetes [created] bc012abc8
Removed x-pack from official senssoft elasticsearch docker image. Project: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/commit/93eb9eb1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/tree/93eb9eb1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/diff/93eb9eb1 Branch: refs/heads/kubernetes Commit: 93eb9eb1971f42066b7b129317871ba641c89e57 Parents: 2b93e9b Author: Michelle Beard <mbe...@draper.com> Authored: Fri Feb 9 16:59:06 2018 -0500 Committer: Michelle Beard <mbe...@draper.com> Committed: Fri Feb 9 16:59:06 2018 -0500 ---------------------------------------------------------------------- docker/elasticsearch/.env | 9 +++++++ docker/elasticsearch/Dockerfile | 5 ++++ docker/elasticsearch/config/elasticsearch.yml | 28 ++++++++++++---------- 3 files changed, 29 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/93eb9eb1/docker/elasticsearch/.env ---------------------------------------------------------------------- diff --git a/docker/elasticsearch/.env b/docker/elasticsearch/.env new file mode 100644 index 0000000..96e09bb --- /dev/null +++ b/docker/elasticsearch/.env @@ -0,0 +1,9 @@ +CLUSTER_NAME=SensSoft +NODE_MASTER=true +NODE_DATA=true +NODE_NAME=soft-01 +NETWORK_HOST=0.0.0.0 +NODE_COORDINATE=true +HTTP_ENABLE=true +HTTP_CORS_ENABLE=true +HTTP_CORS_ALLOW_ORIGIN='*' http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/93eb9eb1/docker/elasticsearch/Dockerfile ---------------------------------------------------------------------- diff --git a/docker/elasticsearch/Dockerfile b/docker/elasticsearch/Dockerfile index 7cdbae7..6256564 100644 --- a/docker/elasticsearch/Dockerfile +++ b/docker/elasticsearch/Dockerfile @@ -25,3 +25,8 @@ ENV CLUSTER_NAME SensSoft # Kubernetes requires swap is turned off ENV MEMORY_LOCK false + +# DELETE XPACK Plugin +RUN elasticsearch-plugin remove x-pack --silent + +EXPOSE 9200 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/93eb9eb1/docker/elasticsearch/config/elasticsearch.yml ---------------------------------------------------------------------- diff --git a/docker/elasticsearch/config/elasticsearch.yml b/docker/elasticsearch/config/elasticsearch.yml index ca31f63..6596dec 100644 --- a/docker/elasticsearch/config/elasticsearch.yml +++ b/docker/elasticsearch/config/elasticsearch.yml @@ -13,19 +13,21 @@ # See the License for the specific language governing permissions and # limitations under the License. +# Custom config borrowed from Pires: https://github.com/pires/docker-elasticsearch-kubernetes + cluster: - name: ${CLUSTER_NAME} + name: ${CLUSTER_NAME:SensSoft} node: - master: ${NODE_MASTER} - data: ${NODE_DATA} - #name: ${NODE_NAME} - ingest: ${NODE_INGEST} - max_local_storage_nodes: ${MAX_LOCAL_STORAGE_NODES} + master: ${NODE_MASTER:true} + data: ${NODE_DATA:true} + name: ${NODE_NAME:${HOSTNAME}} + ingest: ${NODE_INGEST:true} + max_local_storage_nodes: ${MAX_LOCAL_STORAGE_NODES:1} -network.host: ${NETWORK_HOST} +network.host: ${NETWORK_HOST:0.0.0.0} -search.remote.connect: ${NODE_COORDINATE} +search.remote.connect: ${NODE_COORDINATE:true} path: data: /usr/share/elasticsearch/data @@ -35,14 +37,14 @@ bootstrap: memory_lock: ${MEMORY_LOCK} http: - enabled: ${HTTP_ENABLE} + enabled: ${HTTP_ENABLE:true} compression: true cors: - enabled: ${HTTP_CORS_ENABLE} - allow-origin: ${HTTP_CORS_ALLOW_ORIGIN} + enabled: ${HTTP_CORS_ENABLE:true} + allow-origin: ${HTTP_CORS_ALLOW_ORIGIN:*} # Prevent the "split brain" by configuring the majority of nodes (total number of nodes / 2 + 1): discovery: zen: - ping.unicast.hosts: ${DISCOVERY_SERVICE} - minimum_master_nodes: ${NUMBER_OF_MASTERS} + ping.unicast.hosts: ${DISCOVERY_SERVICE:127.0.0.1, [::1]} + minimum_master_nodes: ${NUMBER_OF_MASTERS:1}
