Commit 46d34820 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Corrige proyecto y servicio para docker-compose 

Ambos valores han de definirse en el entorno remoto, no solamente en el
de despliegue. En este caso, docker-compose puede tomarlos directamente
del entorno en lugar de a través de parámetros, pero solo si están
presentes.
parent c06cf474

script/_definitions.sh

+0 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
ENV_PREFIX="${ENV_PREFIX:-DD_}"

ENV_SPACE_REPLACEMENT="${ENV_SPACE_REPLACEMENT:-<dd-space>}"

COMPOSE_FILE="${COMPOSE_FILE:-docker-compose.yml}"

COMPOSE_PROJECT_NAME="${STACK}"

DEPLOY_PATH="${DEPLOY_PATH:-~}"

DEPLOY_DIR_NAME="${DEPLOY_DIR_NAME:-deploy}"

DEFAULT_DEPLOY_FILES="${DEFAULT_DEPLOY_FILES:-docker-compose*.yml .env}"

script/_do-deploy.sh

+2 −0
Original line number Diff line number Diff line
@@ -18,10 +18,12 @@ deployCmd="\ 
		env -i /bin/sh -c \". \$(pwd)/.env-deploy && \

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

	else \

		export COMPOSE_FILE=\"${COMPOSE_FILE}\" COMPOSE_PROJECT_NAME=\"${STACK}\" ; \

		docker-compose stop && \

		docker-compose rm -f && \

		docker-compose pull && \

		docker-compose up -d ; \

		unset COMPOSE_FILE COMPOSE_PROJECT_NAME ; \

	fi"



cleanDeployCmd="ssh ${SSH_PARAMS} \"${SSH_REMOTE}\" \"rm -rf ${DEPLOY_HOME}\""