Commit 405e885e authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Retoca detalles de la salida

See merge request redmic-project/docker/docker-deploy!8
parents 11ea0974 65c5aae7

script/_check-deploy.sh

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ echo -e "\n${INFO_COLOR}Checking deployment of services [${NULL_COLOR} ${SERVICE 
for serviceToCheck in ${SERVICES_TO_CHECK}

do

	echo -e "${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, min. status hits ${NULL_COLOR}${STATUS_CHECK_MIN_HITS}\n"

	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}\n"



	checkDeployCmd="\

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

script/_ssh-config.sh

+2 −6
Original line number Diff line number Diff line
@@ -4,17 +4,13 @@ 


if [ -z "${SSH_REMOTE}" ]

then

	echo -e "${FAIL_COLOR}You must define 'SSH_REMOTE' in environment, with remote user and hostname (like \

		'ssh-user@ssh-remote')${NULL_COLOR}"



	echo -e "${FAIL_COLOR}You must define 'SSH_REMOTE' in environment, with remote user and hostname (like 'ssh-user@ssh-remote')${NULL_COLOR}"

	exit 1

fi



if [ -z "${GITLAB_DEPLOY_KEY}" ]

then

	echo -e "${FAIL_COLOR}You must define 'GITLAB_DEPLOY_KEY' in environment, with a SSH private key accepted by \

		remote server${NULL_COLOR}"



	echo -e "${FAIL_COLOR}You must define 'GITLAB_DEPLOY_KEY' in environment, with a SSH private key accepted by remote server${NULL_COLOR}"

	exit 1

fi

script/create-nets.sh

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ then 
	exit 1

fi



echo -e "\n${INFO_COLOR}Preparing connection to remote target ..${NULL_COLOR}\n"

. _ssh-config.sh



createNetsCmd=""

script/deploy.sh

+1 −2
Original line number Diff line number Diff line
@@ -13,14 +13,13 @@ then 
	exit 1

fi



echo -e "\n${INFO_COLOR}Preparing connection to remote target ..${NULL_COLOR}\n"

. _ssh-config.sh



. _prepare-deploy.sh



. _do-deploy.sh



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

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

sleep ${STATUS_CHECK_DELAY}



. _check-deploy.sh