Commit 28ab8789 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Trata de resolver warnings mostrados en la salida

See merge request redmic-project/docker/docker-deploy!11
parents def4ef2d a6589804

script/_check-deploy.sh

+5 −5
Original line number Diff line number Diff line
@@ -2,12 +2,12 @@ 


SERVICES_TO_CHECK="${SERVICES_TO_CHECK:-${STACK:-${SERVICE}}}"



echo -e "\n${INFO_COLOR}Checking deployment of services [${NULL_COLOR} ${SERVICES_TO_CHECK} ${INFO_COLOR}] ..${NULL_COLOR}"

echo -e "\n${INFO_COLOR}Checking deployment of services [${DATA_COLOR} ${SERVICES_TO_CHECK} ${INFO_COLOR}] ..${NULL_COLOR}"



for serviceToCheck in ${SERVICES_TO_CHECK}

do

	echo -e "\n${INFO_COLOR}Checking deployment of service ${NULL_COLOR}${serviceToCheck}${INFO_COLOR} ..${NULL_COLOR}"

	echo -e "  ${INFO_COLOR}retries ${NULL_COLOR}${STATUS_CHECK_RETRIES}${INFO_COLOR}, interval ${NULL_COLOR}${STATUS_CHECK_INTERVAL}${INFO_COLOR}s, hits ${NULL_COLOR}${STATUS_CHECK_MIN_HITS}"

	echo -e "\n${INFO_COLOR}Checking deployment of service ${DATA_COLOR}${serviceToCheck}${INFO_COLOR} ..${NULL_COLOR}"

	echo -e "  ${INFO_COLOR}retries ${DATA_COLOR}${STATUS_CHECK_RETRIES}${INFO_COLOR}, interval ${DATA_COLOR}${STATUS_CHECK_INTERVAL}${INFO_COLOR}s, hits ${DATA_COLOR}${STATUS_CHECK_MIN_HITS}${NULL_COLOR}"



	checkDeployCmd="\

		docker stack ls > /dev/null 2> /dev/null ; \
@@ -43,7 +43,7 @@ do 
				hits=\$((\${hits} + 1)) && \

				if [ \"\${hits}\" -eq \"${STATUS_CHECK_MIN_HITS}\" ] ; \

				then \

					echo -e \"${PASS_COLOR}Service ${NULL_COLOR}${serviceToCheck}${PASS_COLOR} is running!${NULL_COLOR}\" && \

					echo -e \"${PASS_COLOR}Service ${DATA_COLOR}${serviceToCheck}${PASS_COLOR} is running!${NULL_COLOR}\" && \

					echo -e \"  got ${PASS_COLOR}\${hits}/${STATUS_CHECK_MIN_HITS}${NULL_COLOR} status hits\" && \

					exit 0 ; \

				fi ; \
@@ -52,7 +52,7 @@ do 
			fi ; \

			sleep ${STATUS_CHECK_INTERVAL} ; \

		done ; \

		echo -e \"${FAIL_COLOR}Service ${NULL_COLOR}${serviceToCheck}${FAIL_COLOR} is not running!${NULL_COLOR}\" && \

		echo -e \"${FAIL_COLOR}Service ${DATA_COLOR}${serviceToCheck}${FAIL_COLOR} is not running!${NULL_COLOR}\" && \

		echo -e \"  got ${FAIL_COLOR}\${hits}/${STATUS_CHECK_MIN_HITS}${NULL_COLOR} status hits\" && \

		exit 1 \

	"

script/_definitions.sh

+4 −2
Original line number Diff line number Diff line
@@ -4,16 +4,18 @@ COMPOSE_FILE="${COMPOSE_FILE:-docker-compose.yml}" 
DEPLOY_PATH="${DEPLOY_PATH:-~}"

DEPLOY_DIR_NAME="${DEPLOY_DIR_NAME:-deploy}"

DEFAULT_DEPLOY_FILES="${DEFAULT_DEPLOY_FILES:-docker-compose*.yml .env}"

REGISTRY_USER="${REGISTRY_USER:-gitlab-ci-token}"



STATUS_CHECK_RETRIES="${STATUS_CHECK_RETRIES:-10}"

STATUS_CHECK_INTERVAL="${STATUS_CHECK_INTERVAL:-5}"

STATUS_CHECK_DELAY="${STATUS_CHECK_DELAY:-20}"

STATUS_CHECK_MIN_HITS="${STATUS_CHECK_MIN_HITS:-3}"



INFO_COLOR='\033[0;36m'

INFO_COLOR='\033[1;36m'

DATA_COLOR='\033[1;33m'

FAIL_COLOR='\033[0;31m'

PASS_COLOR='\033[0;32m'

NULL_COLOR='\033[0m'



SSH_PARAMS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"

SSH_PARAMS="-o UserKnownHostsFile=/dev/null -o Host=* -o StrictHostKeyChecking=no"

SCRIPTS_PATH="/usr/bin/"

script/_do-deploy.sh

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ echo -e "\n${INFO_COLOR}Deploying at remote target ..${NULL_COLOR}\n" 


deployCmd="\

	cd ${DEPLOY_HOME} && \

	docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY} && \

	echo \"${CI_JOB_TOKEN}\" | docker login --username ${REGISTRY_USER} --password-stdin ${CI_REGISTRY} && \

	docker stack ls > /dev/null 2> /dev/null ; \

	if [ \"\${?}\" -ne \"0\" ] ; \

	then \

script/deploy.sh

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ fi 


. _do-deploy.sh



echo -e "\n${INFO_COLOR}Waiting ${STATUS_CHECK_DELAY}s before checking deployment ..${NULL_COLOR}"

echo -e "\n${INFO_COLOR}Waiting ${DATA_COLOR}${STATUS_CHECK_DELAY}${INFO_COLOR}s before checking deployment ..${NULL_COLOR}"

sleep ${STATUS_CHECK_DELAY}



. _check-deploy.sh