Commit e3a83658 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Corrige recursos y timeout de reinicio

See merge request redmic-project/elastic/elasticsearch!44
parents 9d169686 2e66be56

deploy/docker-compose.elasticsearch-1.dev.yml

+8 −0
Original line number Diff line number Diff line
@@ -16,6 +16,14 @@ services: 
      - target: ${PORT2}

        published: ${PORT2}

        mode: host

    deploy:

      resources:

        limits:

          cpus: '1'

          memory: 1G

        reservations:

          cpus: '0.2'

          memory: 820M



volumes:

  elasticsearch-vol:

deploy/docker-compose.elasticsearch-1.prod.yml

+7 −0
Original line number Diff line number Diff line
@@ -19,6 +19,13 @@ services: 
        constraints:

          - node.role == worker

          - engine.labels.availability_zone == ${AWS_REGION}a

      resources:

        limits:

          cpus: '1'

          memory: 2G

        reservations:

          cpus: '0.2'

          memory: 1639M



volumes:

  elasticsearch-vol:

deploy/docker-compose.elasticsearch-1.tmpl.yml

+1 −7
Original line number Diff line number Diff line
@@ -24,14 +24,8 @@ services: 
      replicas: 1

      restart_policy:

        condition: on-failure

        delay: 1m

        delay: 10s

        window: 3m

      resources:

        limits:

          cpus: '1'

          memory: 1G

        reservations:

          memory: 820M



networks:

  elastic-net:

deploy/docker-compose.elasticsearch-2.tmpl.yml

+2 −1
Original line number Diff line number Diff line
@@ -34,13 +34,14 @@ services: 
          - engine.labels.availability_zone == ${AWS_REGION}b

      restart_policy:

        condition: on-failure

        delay: 1m

        delay: 10s

        window: 3m

      resources:

        limits:

          cpus: '1'

          memory: 2G

        reservations:

          cpus: '0.2'

          memory: 1639M



networks:

deploy/docker-compose.elasticsearch-3.tmpl.yml

+2 −1
Original line number Diff line number Diff line
@@ -34,13 +34,14 @@ services: 
          - engine.labels.availability_zone == ${AWS_REGION}c

      restart_policy:

        condition: on-failure

        delay: 1m

        delay: 10s

        window: 3m

      resources:

        limits:

          cpus: '1'

          memory: 2G

        reservations:

          cpus: '0.2'

          memory: 1639M



networks: