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

Define nombre de proyecto mediante variable 

En lugar de usar parámetros al ejecutar, se define el valor de STACK
como nombre de proyecto mediante variable de entorno.
parent 7347aa76

script/_check-deploy.sh

+0 −2
Original line number Diff line number Diff line 
#!/bin/sh



SERVICES_TO_CHECK="${SERVICES_TO_CHECK:-${STACK}}"



echo -e "\n${INFO_COLOR}Checking deployment of services [${DATA_COLOR} ${SERVICES_TO_CHECK} ${INFO_COLOR}] at ${DATA_COLOR}${remoteHost}${INFO_COLOR} ..${NULL_COLOR}"



checkDeployCmd="\

script/_definitions.sh

+2 −0
Original line number Diff line number Diff line
@@ -3,11 +3,13 @@ 
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}"

FORCE_DOCKER_COMPOSE="${FORCE_DOCKER_COMPOSE:-0}"



SERVICES_TO_CHECK="${SERVICES_TO_CHECK:-${STACK}}"

STATUS_CHECK_RETRIES="${STATUS_CHECK_RETRIES:-10}"

STATUS_CHECK_INTERVAL="${STATUS_CHECK_INTERVAL:-20}"

STATUS_CHECK_DELAY="${STATUS_CHECK_DELAY:-120}"

script/_do-deploy.sh

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

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

	else \

		composeCmd=\"docker-compose -p ${STACK}\" ; \

		\${composeCmd} stop && \

		\${composeCmd} rm -f && \

		\${composeCmd} pull && \

		\${composeCmd} up -d ; \

		docker-compose stop && \

		docker-compose rm -f && \

		docker-compose pull && \

		docker-compose up -d ; \

	fi"



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