Commit 86912c5a authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Controla casos de error en comprobación de salud

See merge request redmic-project/docker/docker-deploy!59
parents 391b0aee 0aaa3422

script/_check-deploy.sh

+19 −20
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ checkDeployCmd="\ 
		do \

			if [ ${deployingToSwarm} -eq 0 ] ; \

			then \

				stackServices=\$(docker service ls -f name=\${serviceToCheck} --format '{{.Replicas}}') ; \

				stackServices=\$(docker service ls -f name=\${serviceToCheck} --format '{{.Replicas}}' | sed -r 's/.*([0-9]+\/[0-9]+).*/\1/g') ; \

				serviceToCheckReplication=\$(echo \"\${stackServices}\" | head -1) ; \

				runningServiceName=\$(docker service ls -f name=\${serviceToCheck} --format '{{.Name}}' | head -1) ; \

				serviceCount=\$(echo \"\${stackServices}\" | ${GREP_BIN} -cE '.+') ; \
@@ -33,7 +33,7 @@ checkDeployCmd="\ 
					serviceIsRunning=\"[ 0 -ne 0 ]\" ; \

					success=\"\${success} 0\" ; \

					break ; \

				else \

				fi ; \

				runningServiceCount=\$(echo \"\${serviceToCheckReplication}\" | ${GREP_BIN} -cE '([0-9]+)\/\1') ; \

				serviceIsRunning=\"[ \${runningServiceCount} -eq 1 ]\" ; \

				if ! \${serviceIsRunning} ; \
@@ -55,7 +55,6 @@ checkDeployCmd="\ 
						serviceIsRunning=true ; \

					fi ; \

				fi ; \

				fi ; \

				statusCheckCmd=\${serviceIsRunning} ; \

			else \

				runningContainersIds=\$(docker ps -f status=running --format '{{.ID}}' --no-trunc) ; \

script/_prepare-deploy.sh

+8 −2
Original line number Diff line number Diff line
@@ -117,16 +117,22 @@ echo -e "\n${INFO_COLOR}Checking deployment configuration in compose files ..${N 
echo -e "  ${INFO_COLOR}compose files [ ${DATA_COLOR}${COMPOSE_FILE}${INFO_COLOR} ]${NULL_COLOR}"

echo -en "  ${INFO_COLOR}check command [ ${DATA_COLOR}"



# Prepara los argumentos necesarios para indicar los ficheros compose a usar, para swarm o para compose.

if [ ${deployingToSwarm} -eq 0 ]

then

	swarmComposeFileSplitted=$(echo ${COMPOSE_FILE} | sed 's/:/ -c /g')

else

	standardComposeFileSplitted=$(echo ${COMPOSE_FILE} | sed 's/:/ -f /g')

fi



# Antes de continuar, se comprueba que la configuración de despliegue sea válida para compose o swarm.

if [ ${docker23CompatibleTarget} -eq 0 ] && [ ${deployingToSwarm} -eq 0 ]

then

	echo -e "docker stack config${INFO_COLOR} ]${NULL_COLOR}\n"

	swarmComposeFileSplitted=$(echo ${COMPOSE_FILE} | sed 's/:/ -c /g')

	grep -v '^[#| ]' .env | sed -r "s/(\w+)=(.*)/export \1='\2'/g" > .env-config

	checkComposeFilesCmd="env -i /bin/sh -c \". \$(pwd)/.env-config && /usr/local/bin/docker stack config -c ${swarmComposeFileSplitted} > /dev/null\""

else

	echo -e "docker compose config${INFO_COLOR} ]${NULL_COLOR}\n"

	standardComposeFileSplitted=$(echo ${COMPOSE_FILE} | sed 's/:/ -f /g')

	checkComposeFilesCmd="docker compose config -q"

fi