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

Merge branch 'dev' into 'master' 

Omite comandos 'eval', deja ejecutar directamente

See merge request redmic-project/docker/docker-deploy!24
parents ab30b8bf f8c70f1e

script/_check-deploy.sh

+2 −3
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ do 
				statusCheckCmd=\"[ \${serviceContainerId:-_} = \${runningService:--} -o \

					\${serviceContainerId:-_} = \${successfullyExitedService:--} ]\" ; \

			fi ; \

			if eval \"\${statusCheckCmd}\" ; \

			if \${statusCheckCmd} ; \

			then \

				echo -e \"${PASS_COLOR}[PASS]${NULL_COLOR}\" && \

				hits=\$((\${hits} + 1)) && \
@@ -58,8 +58,7 @@ do 
		done ; \

		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 \

	"

		exit 1"



	ssh ${SSH_PARAMS} "${SSH_REMOTE}" "${checkDeployCmd}"

done

script/_do-deploy.sh

+5 −4
Original line number Diff line number Diff line
@@ -15,15 +15,16 @@ deployCmd="\ 
		docker-compose rm -f ${SERVICE} && \

		docker-compose pull ${SERVICE} && \

		docker-compose up -d ${SERVICE} ; \

	fi ; \

	cd .. && \

	rm -rf ${DEPLOY_HOME}\

"

	fi"



cleanDeployCmd="ssh ${SSH_PARAMS} \"${SSH_REMOTE}\" \"rm -rf ${DEPLOY_HOME}\""



if ssh ${SSH_PARAMS} "${SSH_REMOTE}" "${deployCmd}"

then

	echo -e "${PASS_COLOR}Service successfully deployed!${NULL_COLOR}"

	${cleanDeployCmd}

else

	echo -e "${FAIL_COLOR}Service deploy failed!${NULL_COLOR}"

	${cleanDeployCmd}

	exit 1

fi

script/_ssh-config.sh

+1 −1
Original line number Diff line number Diff line
@@ -17,5 +17,5 @@ then 
fi



# Se prepara la identidad para conectar al servidor de despliegue.

eval "$(ssh-agent -s)"

ssh-agent -s

echo "${GITLAB_DEPLOY_KEY}" | tr -d '\r' | ssh-add - > /dev/null

script/create-nets.sh

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ createNetsInRemoteCmd="\ 
		createNetCmd=\"\${createNetCmd} -d overlay --attachable\" ; \

	fi ; \

	createNetsCmd=\$(echo \"${createNetsCmd}\") && \

	eval \"\${createNetsCmd}\""

	\${createNetsCmd}"



if ssh ${SSH_PARAMS} "${SSH_REMOTE}" ${createNetsInRemoteCmd}

then

script/relaunch.sh

+1 −2
Original line number Diff line number Diff line
@@ -23,8 +23,7 @@ relaunchCmd="\ 
	docker login -u ${REGISTRY_USER} -p ${CI_JOB_TOKEN} ${CI_REGISTRY} && \

	docker pull \${imageNameAndTag} && \

	imageDigest=\$(docker images --digests --format '{{.Digest}}' \${imageName} | head -1) && \

	docker service update --force --image \${imageName}@\${imageDigest} ${SERVICE} \

"

	docker service update --force --image \${imageName}@\${imageDigest} ${SERVICE}"



if ssh ${SSH_PARAMS} "${SSH_REMOTE}" "${relaunchCmd}"

then