Commit 0f0ca922 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Define path donde se guardan los datos

See merge request redmic-project/elastic/elasticsearch!3
parents 23b30663 250e64d0

Dockerfile

+5 −1
Original line number Diff line number Diff line
@@ -10,7 +10,9 @@ ENV ES_CLUSTER_NAME="clustername" \ 
	ES_NETWORK_HOST="0.0.0.0" \

	ES_NETWORK_BIND_HOST="0.0.0.0" \

	ES_NETWORK_PUBLISH_HOST="_eth0_" \

	ES_DISCOVERY_ZEN_MINIMUM_MASTER_NODES=2

	ES_DISCOVERY_ZEN_MINIMUM_MASTER_NODES=2 \

	ES_PATH="/usr/share/elasticsearch" \

	ES_DATA_PATH="/usr/share/elasticsearch/data"



RUN apt-get update && \

	apt-get install -y --no-install-recommends \
@@ -21,6 +23,8 @@ RUN apt-get update && \ 
COPY config/ /usr/share/elasticsearch/config/

COPY scripts/ /



VOLUME ["${ES_DATA_PATH}"]



ENTRYPOINT ["/docker-entrypoint.sh"]



CMD ["elasticsearch"]

docker-compose.prod.yml

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ services: 
      - ES_NODE_NAME={{.Service.Name}}-{{.Task.Slot}}

    deploy:

      mode: replicated

      replicas: 2

      replicas: 3

      placement:

        constraints:

          - node.role == worker

scripts/docker-entrypoint.sh

+4 −1
Original line number Diff line number Diff line 
#!/bin/bash



FILENAME="elasticsearch"

ES_PATH="/usr/share/elasticsearch"

OTHER_NODES=""



chown -R elasticsearch:elasticsearch ${ES_DATA_PATH}



if [ -n "${SWARM_MODE}" ]; then

    if [ -z "${SERVICE_NAME}" ]; then

        >&2 echo "Environment variable SERVICE_NAME not set. You MUST set it to name of docker swarm service"
@@ -90,4 +91,6 @@ for PLUGIN in "${PLUGINS[@]}"; do 
    fi

done



cat ${ES_PATH}/config/${FILENAME}.yml



gosu elasticsearch "$@"
 
 No newline at end of file

scripts/elasticsearch.template

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ bootstrap.memory_lock: ${ES_BOOTSTRAP_MEMORY_LOCK} 


indices.query.bool.max_clause_count: ${ES_INDICES_QUERY_BOOL_MAX_CLAUSE_COUNT}



path.data: ${ES_DATA_PATH}/data



xpack.graph.enabled: false

xpack.ml.enabled: false

xpack.monitoring.enabled: false