Commit 7347aa76 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Permite usar docker-compose en vez de Swarm 

Hay casos en que el entorno Docker de despliegue es un cluster de Docker
Swarm, pero aun así se necesita arrancar servicios usando
docker-compose. Por ejemplo, cuando se desea arrancar con privilegios,
acceder a dispositivos del sistema, cargar módulos del kernel, etc.
Para ello, se permite fijar el uso de docker-compose, sin importar el
entorno remoto en que se despliegue.
parent 38e25efc

README.md

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ You may define these environment variables (**bold** are mandatory): 
* *DEPLOY_PATH*: Path in remote host where deployment directory (containing temporary files) will be created. Default `~`.

* *DEPLOY_DIR_NAME*: Name of directory containing files needed for deployment. Default `deploy`.

* *DEFAULT_DEPLOY_FILES*: Files needed for deployment, if `${DEPLOY_DIR_NAME}` does not exist. Default `docker-compose*.yml .env`.

* *FORCE_DOCKER_COMPOSE*: Use always standard mode with docker-compose instead of Docker Swarm, even if it is available on remote Docker environment. Default `0`.

* *REGISTRY_URL*: Address of Docker registry where Docker images to deploy are stored. Leave it empty to use Docker Hub registry.

* *REGISTRY_USER*: Docker registry username of user with read permissions. **Required** for private registries.

* *REGISTRY_PASS*: Docker registry user password of user with read permissions. **Required** for private registries.

script/_check-deploy.sh

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ checkDeployCmd="\ 
		hits=0 && \

		for i in \$(seq 1 ${STATUS_CHECK_RETRIES}) ; \

		do \

			if docker stack ls > /dev/null 2> /dev/null ; \

			if [ ${FORCE_DOCKER_COMPOSE} -eq 0 ] && docker stack ls > /dev/null 2> /dev/null ; \

			then \

				stackServices=\$(docker service ls -f name=\${serviceToCheck} --format '{{.Replicas}}') ; \

				serviceToCheckReplication=\$(echo \"\${stackServices}\" | head -1) ; \

script/_definitions.sh

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ COMPOSE_FILE="${COMPOSE_FILE:-docker-compose.yml}" 
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}"



STATUS_CHECK_RETRIES="${STATUS_CHECK_RETRIES:-10}"

STATUS_CHECK_INTERVAL="${STATUS_CHECK_INTERVAL:-20}"

script/_do-deploy.sh

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ deployCmd="\ 
	else \

		deployAuthParam=\"\" ; \

	fi ; \

	if docker stack ls > /dev/null 2> /dev/null ; \

	if [ ${FORCE_DOCKER_COMPOSE} -eq 0 ] && docker stack ls > /dev/null 2> /dev/null ; \

	then \

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

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