Commit 1594adbf authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Reordena parámetros de deploy para soportar auth

See merge request redmic-project/docker/docker-deploy!55
parents 0a796ecf 82d90e4d

script/_do-deploy.sh

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ deployCmd="\ 
		composeFileSplitted=\$(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 -c \${composeFileSplitted} \${deployAuthParam} ${STACK}\" ; \

			docker stack deploy \${deployAuthParam} -c \${composeFileSplitted} ${STACK}\" ; \

	else \

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

		composeCmd=\"docker-compose -f \${composeFileSplitted} -p ${STACK}\" && \