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

Merge branch 'dev' into 'master' 

Baja mínimo de master y omite puertos para pro

See merge request redmic-project/elastic/elasticsearch!6
parents c0b732bc 24f6da1d

docker-compose.dev.yml

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ services: 
    environment:

      - ES_CLUSTER_NAME=elasticsearch_dev

      - ES_NODE_NAME=node-1

      - ES_DISCOVERY_ZEN_MINIMUM_MASTER_NODES=1

    ulimits:

      memlock:

        soft: -1

docker-compose.prod.yml

+0 −3
Original line number Diff line number Diff line
@@ -6,9 +6,6 @@ services: 
      elastic-net:

        aliases:

          - es-{{.Task.Slot}}

    ports:

      - ${PORT1}

      - ${PORT2}

    environment:

      - SWARM_MODE=true

      - SERVICE_NAME={{.Service.Name}}

docker-compose.tmpl.yml

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ services: 
    environment:

      - ES_BOOTSTRAP_MEMORY_LOCK=true

      - ES_JAVA_OPTS=-Xms2g -Xmx2g -Djava.security.policy=file:///usr/share/elasticsearch/config/grovy-classes_whitelist.policy

      - ES_DISCOVERY_ZEN_MINIMUM_MASTER_NODES=1

      - ES_PLUGINS

      - OLD_ELASTIC_ADMIN_PASS

      - ELASTIC_ADMIN_PASS