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

Merge branch 'dev' into 'master' 

Acorta nombre de stack de producción

See merge request redmic-project/elastic/elasticsearch!5
parents 093c7796 291a88ee

.gitlab-ci.yml

+2 −1
Original line number Diff line number Diff line
@@ -147,7 +147,8 @@ deploy-pro: 
  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    SERVICE: ${CI_PROJECT_NAME}

    SERVICE: elastic

    SERVICES_TO_CHECK: elastic_${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.dev.yml

+4 −0
Original line number Diff line number Diff line
@@ -15,6 +15,10 @@ services: 
      - ES_CLUSTER_NAME=elasticsearch_dev

      - ES_NODE_NAME=node-1

      - ES_DISCOVERY_ZEN_MINIMUM_MASTER_NODES=1

    ulimits:

      memlock:

        soft: -1

        hard: -1



volumes:

  elasticsearch-vol:

docker-compose.prod.yml

+1 −2
Original line number Diff line number Diff line
@@ -31,5 +31,4 @@ volumes: 
    driver_opts:

      backing: relocatable

      size: 25

      ebstype: io1

      iops: 100
 
      ebstype: gp2

docker-compose.tmpl.yml

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

      - ELASTIC_USER_PASS

      - ELASTIC_USER_ROLE

    ulimits:

      memlock:

        soft: -1

        hard: -1

    healthcheck:

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

      interval: 30s

scripts/docker-entrypoint.sh

+1 −1
Original line number Diff line number Diff line
@@ -93,6 +93,6 @@ done 


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



./manage-users.sh & disown

/manage-users.sh & disown



gosu elasticsearch "$@"