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

Merge branch 'dev' into 'master' 

Añade variable OMIT_CLEAN_DEPLOY, retoca mensajes

See merge request redmic-project/docker/docker-deploy!50
parents 65da6fa3 3649ae3c

README.md

+4 −1
Original line number Diff line number Diff line
@@ -23,8 +23,10 @@ For REDMIC, we use this image into CI/CD configuration. Deploy jobs are defined 


```

$ docker run --rm --name docker-deploy \

	-e STACK=your-stack-name -e SSH_REMOTE=ssh-user@host -e DEPLOY_KEY="<your-private-key>" \

	-e SSH_REMOTE=ssh-user@host -e DEPLOY_KEY="<your-private-key>" \

	-e STACK=your-stack-name \

	-v $(pwd)/docker-compose.yml:/docker-compose.yml \

	-v $(pwd)/.env:/.env \

	redmic/docker-docker-deploy:latest \

	<action> <arg1> <arg2> ...

```
@@ -59,6 +61,7 @@ You may define these environment variables (**bold** are mandatory): 
* *ENV_PREFIX*: Prefix used to identify variables to be defined in remote environment and service, available there without this prefix. Change this if default value collides with the beginning of your variable names. Default `DD_`.

* *ENV_SPACE_REPLACEMENT*: Unique string (change this if that is not true for you) used to replace spaces into variable values while handling them. Default `<dd-space>`.

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

* *OMIT_CLEAN_DEPLOY*: Leave at remote host deployment resources after doing a successful deploy. Useful when using bind mounts or *docker-compose* secrets (pointing to static content in deployment resources). Default `0`.

* *GREP_BIN*: Path to *grep* binary in remote host. Default `grep`.

* *REGISTRY_PASS*: Docker registry password, corresponding to a user with read permissions. **Required** for private registry or repository.

* *REGISTRY_URL*: Docker registry address, where Docker must log in to retrieve images. Useful only when using private registry or repository. Default is empty, to use Docker Hub registry.

script/_definitions.sh

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

OMIT_CLEAN_DEPLOY="${OMIT_CLEAN_DEPLOY:-0}"



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

STATUS_CHECK_RETRIES="${STATUS_CHECK_RETRIES:-10}"

script/_do-deploy.sh

+7 −2
Original line number Diff line number Diff line
@@ -31,9 +31,14 @@ cleanDeployCmd="ssh ${SSH_PARAMS} \"${SSH_REMOTE}\" \"rm -rf ${DEPLOY_HOME}\"" 
if ssh ${SSH_PARAMS} "${SSH_REMOTE}" "${deployCmd}"

then

	echo -e "${PASS_COLOR}Services successfully deployed!${NULL_COLOR}"

	if [ ${OMIT_CLEAN_DEPLOY} -eq 0 ]

	then

		eval "${cleanDeployCmd}"

	else

	echo -e "${FAIL_COLOR}Services deploy failed!${NULL_COLOR}"

		echo -e "${INFO_COLOR}Deployment resources cleaning omitted${NULL_COLOR}"

	fi

else

	echo -e "${FAIL_COLOR}Services deployment failed!${NULL_COLOR}"

	eval "${cleanDeployCmd}"

	ssh ${SSH_PARAMS} -q -O exit "${SSH_REMOTE}"

	exit 1

script/_prepare-deploy.sh

+8 −8
Original line number Diff line number Diff line 
#!/bin/sh



echo -e "\n${INFO_COLOR}Preparing deploy configuration and resources ..${NULL_COLOR}"

echo -e "\n${INFO_COLOR}Preparing deployment configuration and resources ..${NULL_COLOR}"



randomValue="$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 8 | head -n 1)"

deployHomeParent="${DEPLOY_PATH}/docker-deploy"
@@ -46,7 +46,7 @@ done 
echo -e ${envDefs} >> .env



echo -e " ]${NULL_COLOR}"

echo -e "\n${INFO_COLOR}Checking deploy configuration in docker-compose files ..${NULL_COLOR}"

echo -e "\n${INFO_COLOR}Checking deployment configuration in docker-compose files ..${NULL_COLOR}"

echo -e "  ${INFO_COLOR}compose files [ ${DATA_COLOR}${COMPOSE_FILE}${INFO_COLOR} ]${NULL_COLOR}\n"



# Antes de continuar, se comprueba que la configuración de despliegue sea válida.
@@ -58,14 +58,14 @@ else 
	exit 1

fi



echo -e "\n${INFO_COLOR}Sending deploy resources to remote ${DATA_COLOR}${remoteHost}${INFO_COLOR} ..${NULL_COLOR}"

echo -e "  ${INFO_COLOR}deploy path [ ${DATA_COLOR}${DEPLOY_HOME}${INFO_COLOR} ]${NULL_COLOR}"

echo -e "  ${INFO_COLOR}deploy files [ ${DATA_COLOR}${deployFiles}${INFO_COLOR} ]${NULL_COLOR}\n"

echo -e "\n${INFO_COLOR}Sending deployment resources to remote ${DATA_COLOR}${remoteHost}${INFO_COLOR} ..${NULL_COLOR}"

echo -e "  ${INFO_COLOR}deployment path [ ${DATA_COLOR}${DEPLOY_HOME}${INFO_COLOR} ]${NULL_COLOR}"

echo -e "  ${INFO_COLOR}deployment files [ ${DATA_COLOR}${deployFiles}${INFO_COLOR} ]${NULL_COLOR}\n"



# Se crea el directorio donde guardar los ficheros de despliegue del servicio.

if ! ssh ${SSH_PARAMS} "${SSH_REMOTE}" ${createDirCmd}

then

	echo -e "${FAIL_COLOR}Deploy path ${DATA_COLOR}${DEPLOY_HOME}${FAIL_COLOR} creation failed!${NULL_COLOR}"

	echo -e "${FAIL_COLOR}Deployment path ${DATA_COLOR}${DEPLOY_HOME}${FAIL_COLOR} creation failed!${NULL_COLOR}"

	ssh ${SSH_PARAMS} -q -O exit "${SSH_REMOTE}"

	exit 1

fi
@@ -73,9 +73,9 @@ fi 
# Se envían a su destino los ficheros de despliegue del servicio.

if scp ${SSH_PARAMS} ${deployFiles} "${SSH_REMOTE}:${DEPLOY_HOME}"

then

	echo -e "${PASS_COLOR}Deploy resources successfully sent!${NULL_COLOR}"

	echo -e "${PASS_COLOR}Deployment resources successfully sent!${NULL_COLOR}"

else

	echo -e "${FAIL_COLOR}Deploy resources sending failed!${NULL_COLOR}"

	echo -e "${FAIL_COLOR}Deployment resources sending failed!${NULL_COLOR}"

	ssh ${SSH_PARAMS} -q -O exit "${SSH_REMOTE}"

	exit 1

fi