Commit 004cec42 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Elimina healthcheck y prueba nombres con cluster

See merge request redmic-project/elastic/elasticsearch!24
parents 6dba7b8a 0f96d624

.gitlab-ci.yml

+1 −4
Original line number Diff line number Diff line
@@ -146,11 +146,8 @@ deploy-pro: 
  image: registry.gitlab.com/redmic-project/docker/docker-deploy:latest

  variables:

    DOCKER_DRIVER: overlay2

    STATUS_CHECK_DELAY: '60'

    STATUS_CHECK_INTERVAL: '20'

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    SERVICE: elastic

    SERVICES_TO_CHECK: elastic_${CI_PROJECT_NAME}

    SERVICE: ${CI_PROJECT_NAME}

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml

docker-compose.prod.yml

+2 −2
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ services: 
          - es-{{.Task.Slot}}

    environment:

      - ES_CLUSTER_NAME=redmic

      - ES_NODE_NAME=elasticsearch-{{.Task.Slot}}

      - ES_DISCOVERY_ZEN_PING_UNICAST_HOSTS=['tasks.elasticsearch']

      - ES_NODE_NAME={{.Service.Name}}-{{.Task.Slot}}

      - ES_DISCOVERY_ZEN_PING_UNICAST_HOSTS=['tasks.{{.Service.Name}}']

    deploy:

      mode: replicated

      replicas: 3

docker-compose.tmpl.yml

+0 −6
Original line number Diff line number Diff line
@@ -14,12 +14,6 @@ services: 
      - ELASTIC_USER

      - ELASTIC_USER_PASS

      - ELASTIC_USER_ROLE

    healthcheck:

      test: curl -sSf -u "${ELASTIC_USER}:${ELASTIC_USER_PASS}" http://localhost:${PORT1}/_cluster/health > /dev/null

      interval: 30s

      timeout: 10s

      retries: 3

      start_period: 2m



networks:

  elastic-net: