Commit 579e6649 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Corrige uso de fichero .env en modo compose 

Hasta el momento, no se estaba aplicando el fichero de valores .env si
este tenía un nombre diferente (aunque se pudiera especificar mediante
variable). Ahora se especifica en los comandos de comprobación de config
y también en el despliegue mediante compose, con --env-file.
parent 202b1655

script/_check-config.sh

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ then 
else

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



	docker compose config -q

	docker compose --env-file "${COMPOSE_ENV_FILE_NAME}" config -q

fi



if [ ${?} -eq 0 ]

script/_do-deploy.sh

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ then 
	deployCmd="${moveToDeployDirCmd}${deploySwarmCmd}"

else

	deployComposeCmd="\

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

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