Commit 5e15898f authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Renueva script de creación de redes 

Refactoriza para aprovechar los procesos definidos para deploy en la
creación de redes, en cuanto a comprobar el entorno previamente.
parent 3136a18c

README.md

+11 −3
Original line number Diff line number Diff line
@@ -12,11 +12,11 @@ You can use it to deploy your own services, supporting **Docker Compose** (both 


  1. **check-env**:



     Check dependencies and version requirements at deployment target host environment.

     Check dependencies, version requirements and available modes at deployment target host environment.



  1. **check-mode**:



     Check supported mode (`Swarm` or `Compose`) at deployment target host environment.

     Check which deploy mode (`Swarm` or `Compose`) will be used at deployment target host environment.



  1. **prepare-env**:
@@ -40,7 +40,15 @@ You can use it to deploy your own services, supporting **Docker Compose** (both 


* **create-nets**:



  Prepare deployment target host environment creating Docker networks which are external to service definition (not created by service deployment itself, defined as *external* in compose files).

  Prepare deployment target host environment creating Docker networks which are external to service definition. A network is external when it's not created by service deployment itself, because is defined as *external* in compose files. Contains several stages:



  1. **check-env**:



     Check dependencies, version requirements and available modes at deployment target host environment.



  1. **do-create-nets**:



     Prepare networks creation command for supported mode and run it at deployment target host environment.



* **relaunch**:

script/_do-create-nets.sh

0 → 100755
+25 −0
Original line number Diff line number Diff line 
#!/bin/sh



# Prepara comando base de creación de red

createNetCmd="docker network create"

if [ ${deployingToSwarm} -eq 0 ]

then

	createNetCmd="${createNetCmd} -d overlay --attachable"

fi



# Prepara comando compuesto de creación de redes

createNetsCmd=""

for netName in "${@}"

do

	createNetsCmd="${createNetsCmd}${createNetCmd} ${netName}; "

done

createNetsCmd="${createNetsCmd} :"



if runRemoteCmd "${createNetsCmd}"

then

	echo -e "${PASS_COLOR}Networks creation was successful!${NULL_COLOR}"

else

	echo -e "${FAIL_COLOR}Networks creation failed!${NULL_COLOR}"

	eval "${closeSshCmd}"

	exit 1

fi

script/create-nets.sh

+2 −23
Original line number Diff line number Diff line
@@ -12,27 +12,6 @@ fi 


echo -e "\n${INFO_COLOR}Creating networks at remote ${DATA_COLOR}${remoteHost}${INFO_COLOR} ..${NULL_COLOR}\n"



createNetsCmd=""

for arg in "${@}"

do

	createNetsCmd="${createNetsCmd}\${createNetCmd} ${arg}; "

done

createNetsCmd="${createNetsCmd} :"

. _check-env.sh



createNetsInRemoteCmd="\

	createNetCmd=\"docker network create\" && \

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

	then \

		createNetCmd=\"\${createNetCmd} -d overlay --attachable\" ; \

	fi ; \

	createNetsCmd=\$(echo \"${createNetsCmd}\") && \

	eval \"\${createNetsCmd}\""



if runRemoteCmd "${createNetsInRemoteCmd}"

then

	echo -e "${PASS_COLOR}Network creation was successful!${NULL_COLOR}"

else

	echo -e "${FAIL_COLOR}Network creation failed!${NULL_COLOR}"

	eval "${closeSshCmd}"

	exit 1

fi
 
. _do-create-nets.sh