Commit 633ca75f authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Añade variable para definir puerto SSH

See merge request redmic-project/docker/docker-deploy!51
parents cab1142a e7454603

README.md

+2 −0
Original line number Diff line number Diff line
@@ -74,6 +74,8 @@ You may define these environment variables (**bold** are mandatory): 
* *STATUS_CHECK_MIN_HITS*: Minimum number of successful checks to consider deployment as successful. Default `3`.

* *STATUS_CHECK_RETRIES*: Maximum number of checks before considering deployment as failed. Default `10`.

* *USE_IMAGE_DIGEST*: Update service image using digest data when relaunching. Available only for *relaunch* action. Default `0`.

* *SSH_PORT*: Port used for SSH connection to remote host. Default `22`.

* *SSH_CONTROL_PERSIST*: Number of seconds while SSH connection to remote host remain open (useful for short but frequent connections). Default `10`.



### Your services

script/_definitions.sh

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ STATUS_CHECK_MIN_HITS="${STATUS_CHECK_MIN_HITS:-3}" 
USE_IMAGE_DIGEST="${USE_IMAGE_DIGEST:-0}"



GREP_BIN="${GREP_BIN:-grep}"

SSH_PORT="${SSH_PORT:-22}"

SSH_CONTROL_PERSIST="${SSH_CONTROL_PERSIST:-10}"



INFO_COLOR='\033[1;36m'
@@ -27,4 +28,4 @@ NULL_COLOR='\033[0m' 


SSH_PARAMS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o LogLevel=error \

	-o "ControlPath=\"/ssh_connection_socket_%h_%p_%r\"" -o ControlMaster=auto \

	-o ControlPersist=${SSH_CONTROL_PERSIST}"
 
	-o ControlPersist=${SSH_CONTROL_PERSIST} -p ${SSH_PORT}"