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

Merge branch 'dev' into 'master' 

Corrige gestión de usuarios y añade delay

See merge request redmic-project/elastic/elasticsearch!7
parents 0f3b1ff2 75356810

scripts/docker-entrypoint.sh

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ if [ -n "${SWARM_MODE}" ]; then 
    fi



    # Delay to let hostname to be published to swarm DNS service

    sleep 15

    sleep ${DISCOVERY_DELAY:-15}



    echo "Discovering other nodes in cluster..."

    # Docker swarm's DNS resolves special hostname "tasks.<service_name" to IP addresses of all containers inside overlay network

scripts/manage-users.sh

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
ELASTIC_ADMIN=elastic

retryManageUsers=true



while [ ${retryManageUsers} ]

while [ "${retryManageUsers}" -eq "true" ]

do

	responseStatus=$(curl --write-out %{http_code} --silent --output /dev/null \

		-u "${ELASTIC_ADMIN}:${ELASTIC_ADMIN_PASS}" \