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

Reutiliza variables y aplica compose por args 

Recupera la definición de ficheros compose cuando se despliega con
compose a través del argumento -f.

Asigna las variables de ficheros compose procesados en el script de
prepare, para no repetir trabajo.
parent 9dbd6777

script/_do-deploy.sh

+2 −4
Original line number Diff line number Diff line
@@ -23,10 +23,9 @@ deployCmd="\ 
	fi ; \

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

	then \

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

		${GREP_BIN} -v '^[#| ]' .env | sed -r \"s/(\w+)=(.*)/export \1='\2'/g\" > .env-deploy && \

		env -i /bin/sh -c \". \$(pwd)/.env-deploy && \

			docker stack deploy \${deployAuthParam} --resolve-image ${SWARM_RESOLVE_IMAGE} -c \${swarmComposeFileSplitted} ${STACK}\" && \

			docker stack deploy \${deployAuthParam} --resolve-image ${SWARM_RESOLVE_IMAGE} -c ${swarmComposeFileSplitted} ${STACK}\" && \

		if [ ! -z \"\${deployAuthParam}\" ] ; \

		then \

			servicesToAuth=\"${SERVICES_TO_AUTH:-${servicesInComposeFiles}}\" && \
@@ -39,8 +38,7 @@ deployCmd="\ 
			fi ; \

		fi ; \

	else \

		COMPOSE_FILE=\"${COMPOSE_FILE}\" ; \

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

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

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

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

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

script/_prepare-deploy.sh

+1 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ then 
	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