Commit 0871a409 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Permite deploy compose con .env no interpolado 

Persiste el fichero temporal de check config con los valores de
variables entrecomillados para el caso en que el despliegue se vaya a
hacer en modo compose en lugar de swarm. De esta manera, se coordina el
uso de check config y deploy al usar comandos docker compose.

Simplifica definición de comando para despliegue con compose.
parent 9d8022c8

script/_check-config.sh

+6 −0
Original line number Diff line number Diff line
@@ -40,6 +40,12 @@ else 
			fi

		done < "${COMPOSE_ENV_FILE_NAME}"

		echo -e "${envConfigContent}" > "${tempEnvFile}"



		# Si se va a desplegar con modo compose, se preservan las variables con interpolación omitida

		if [ ${deployingToSwarm} -ne 0 ]

		then

			cp -a "${tempEnvFile}" "${COMPOSE_ENV_FILE_NAME}"

		fi

	else

		cp -a "${COMPOSE_ENV_FILE_NAME}" "${tempEnvFile}"

	fi

script/_do-deploy.sh

+7 −6
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ then 
	echo -e "\n${INFO_COLOR}Login to registry ${DATA_COLOR}${REGISTRY_URL:-<default>}${INFO_COLOR} ..${NULL_COLOR}\n"



	loginCmd="\

		${GREP_BIN} \"^${ddRegistryPassVarName}=\" \"${COMPOSE_ENV_FILE_NAME}\" | cut -d= -f2- | \

		${GREP_BIN} \"^${ddRegistryPassVarName}=\" \"${COMPOSE_ENV_FILE_NAME}\" | cut -d= -f2- | tr -d \"'\" | \

		docker login -u \"${REGISTRY_USER}\" --password-stdin ${REGISTRY_URL}"



	if runRemoteCmd "${moveToDeployDirCmd}${loginCmd}"
@@ -48,12 +48,13 @@ then 


	deployCmd="${moveToDeployDirCmd}${deploySwarmCmd}"

else

	composeCmd="${composeBaseCmd} -f ${standardComposeFileSplitted} --env-file \"${COMPOSE_ENV_FILE_NAME}\" -p ${STACK}"



	deployComposeCmd="\

		composeCmd=\"${composeBaseCmd} -f ${standardComposeFileSplitted} --env-file "${COMPOSE_ENV_FILE_NAME}" -p ${STACK}\" ; \

		\${composeCmd} stop ${SERVICES_TO_DEPLOY} && \

		\${composeCmd} rm -f ${SERVICES_TO_DEPLOY} && \

		\${composeCmd} pull ${SERVICES_TO_DEPLOY} && \

		\${composeCmd} up -d ${SERVICES_TO_DEPLOY}"

		${composeCmd} stop ${SERVICES_TO_DEPLOY} && \

		${composeCmd} rm -f ${SERVICES_TO_DEPLOY} && \

		${composeCmd} pull ${SERVICES_TO_DEPLOY} && \

		${composeCmd} up -d ${SERVICES_TO_DEPLOY}"



	deployCmd="${moveToDeployDirCmd}${deployComposeCmd}"

fi