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

Merge branch 'dev' into 'master' 

Añade salida a la fase de preparación de deploy

See merge request redmic-project/docker/docker-deploy!13
parents 7c173b99 9321b21a

script/_definitions.sh

+1 −1
Original line number Diff line number Diff line
@@ -17,5 +17,5 @@ FAIL_COLOR='\033[0;31m' 
PASS_COLOR='\033[0;32m'

NULL_COLOR='\033[0m'



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

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

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} && \

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

	docker login -u ${REGISTRY_USER} -p ${CI_JOB_TOKEN} ${CI_REGISTRY} && \

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

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

	then \

script/_prepare-deploy.sh

+12 −1
Original line number Diff line number Diff line 
#!/bin/sh



echo -e "\n${INFO_COLOR}Preparing deploy configuration and resources ..${NULL_COLOR}\n"

echo -e "\n${INFO_COLOR}Preparing deploy configuration and resources ..${NULL_COLOR}"



# Se comprueba si se despliega desde dentro de 'deploy' o desde la raíz del proyecto.

if [ -d "${DEPLOY_DIR_NAME}" ]
@@ -11,6 +11,8 @@ else 
	deployFiles=${DEFAULT_DEPLOY_FILES}

fi



echo -e "\n${INFO_COLOR}Setting environment variables to local and remote environments ..${NULL_COLOR}"



# Los argumentos pasados (opcionales) se tratan como variables de entorno.

# Se prepara el fichero .env para usarlas en la máquina destino y se setean en este entorno también.

envDefs="SERVICE=${SERVICE}\\nSTACK=${STACK}"
@@ -21,16 +23,25 @@ do 
done

echo -e ${envDefs} >> .env



echo -e "\n${INFO_COLOR}Checking deploy configuration in docker-compose files ..${NULL_COLOR}"

echo -e "  ${INFO_COLOR}compose files [ ${DATA_COLOR}${COMPOSE_FILE}${INFO_COLOR} ]${NULL_COLOR}"



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

docker-compose config > /dev/null

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

then

	echo -e "${FAIL_COLOR}Invalid docker-compose configuration!${NULL_COLOR}"

	exit 1

else

	echo -e "${PASS_COLOR}Valid docker-compose configuration!${NULL_COLOR}"

fi



DEPLOY_HOME="${DEPLOY_PATH}/docker/${STACK:-${SERVICE}}"



echo -e "\n${INFO_COLOR}Sending deploy resources to remote ..${NULL_COLOR}"

echo -e "  ${INFO_COLOR}deploy path [ ${DATA_COLOR}${DEPLOY_HOME}${INFO_COLOR} ]${NULL_COLOR}"

echo -e "  ${INFO_COLOR}deploy files [ ${DATA_COLOR}${deployFiles}${INFO_COLOR} ]${NULL_COLOR}"



# Se crea el directorio donde guardar los ficheros de despliegue del servicio.

createDirCmd="mkdir -p ${DEPLOY_HOME}"

ssh ${SSH_PARAMS} "${SSH_REMOTE}" ${createDirCmd}