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

Merge branch 'dev' into 'master' 

Retrasa check deploy y prueba variable en hostname

See merge request redmic-project/elastic/elasticsearch!25
parents 004cec42 df0f78ca

.gitlab-ci.yml

+2 −0
Original line number Diff line number Diff line
@@ -146,6 +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: '10'

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    SERVICE: ${CI_PROJECT_NAME}

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

docker-compose.prod.yml

+2 −3
Original line number Diff line number Diff line
@@ -2,10 +2,9 @@ version: '3.5' 


services:

  elasticsearch:

    hostname: elasticsearch-{{.Task.Slot}}

    networks:

      elastic-net:

        aliases:

          - es-{{.Task.Slot}}

      - elastic-net

    environment:

      - ES_CLUSTER_NAME=redmic

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