|
@@ -186,7 +186,6 @@ then
|
|
|
DOCKERIMAGEINSTALLER="dind"
|
|
|
DOCKERMAKEINSTALL="docker run -it -v ${DIRINSTALL}:${DIRINSTALL} -v /var/run/docker.sock:/tmp/docker.sock ${DOCKERIMAGEINSTALLER} make:installImages ${DIRINSTALL} --client=${CLIENTNAME} --domain=${DOMAINNAME} --branch=${BRANCH} --develop=${DEVELOP}"
|
|
|
DOCKERGETSOURCE="docker run -it -v ${DIRINSTALL}:${DIRINSTALL} -v /var/run/docker.sock:/tmp/docker.sock dind get:source ${DIRINSTALL}/git.ini --timeout=120"
|
|
|
- DOCKERFIXNGINX="docker run -it -v ${DIRINSTALL}:${DIRINSTALL} -v /var/run/docker.sock:/tmp/docker.sock ${DOCKERIMAGEINSTALLER} fix:nginx ${DIRINSTALL}"
|
|
|
DOCKERSERVICE="ln -sf ${DIRINSTALL}/docker-compose.service /etc/systemd/system/docker-compose.service"
|
|
|
###################################################################
|
|
|
docker pull ${DOCKERIMAGEINSTALLERBASE}
|
|
@@ -257,28 +256,6 @@ then
|
|
|
echo -e ""
|
|
|
echo -e ""
|
|
|
echo -e "${BLUE}###############################################################${NOCOLOR}"
|
|
|
- echo -e "Desea ejecutar el fix nginx?"
|
|
|
- echo -e "Opciones:"
|
|
|
- echo -e " Ingrese '${RED}n${NOCOLOR}' para omitir este paso."
|
|
|
- echo -e " Presionar entrer para ejecutar el comando por default: ${GREEN}${DOCKERFIXNGINX}${NOCOLOR}"
|
|
|
- echo -e " Puede ingresar el comando que desee ejecutar."
|
|
|
- read COMMAND
|
|
|
- if [ "${COMMAND}" = "" ];
|
|
|
- then
|
|
|
- eval ${DOCKERFIXNGINX}
|
|
|
- else
|
|
|
- if [ "${COMMAND}" != "n" ] && [ "${COMMAND}" != "N" ];
|
|
|
- then
|
|
|
- eval ${COMMAND}
|
|
|
- fi
|
|
|
- fi
|
|
|
- fcCheckExecution
|
|
|
- ###################################################################
|
|
|
- echo -e ""
|
|
|
- echo -e ""
|
|
|
- echo -e ""
|
|
|
- echo -e ""
|
|
|
- echo -e "${BLUE}###############################################################${NOCOLOR}"
|
|
|
echo -e "Desea registrar el servicio de docker?"
|
|
|
echo -e "Opciones:"
|
|
|
echo -e " Ingrese '${RED}n${NOCOLOR}' para omitir este paso."
|
|
@@ -296,10 +273,6 @@ then
|
|
|
fi
|
|
|
fcCheckExecution
|
|
|
else
|
|
|
- echo -e "${BLUE}###############################################################${NOCOLOR}"
|
|
|
- echo -e "Reconfigurando el nginx"
|
|
|
- eval ${DOCKERFIXNGINX}
|
|
|
- fcCheckExecution
|
|
|
###################################################################
|
|
|
echo -e "${BLUE}###############################################################${NOCOLOR}"
|
|
|
echo -e "Registrando el servicio de docker"
|
|
@@ -335,7 +308,7 @@ then
|
|
|
echo -e ""
|
|
|
echo -e ""
|
|
|
echo -e "${BLUE}###############################################################${NOCOLOR}"
|
|
|
- echo -e "Desea dar de alta los dominios?(${BOLD}Y${NOCOLOR}/n)"
|
|
|
+ echo -e "Desea dar de alta los dominios?(${GREEN}${BOLD}Y${NOCOLOR}/n)"
|
|
|
VALUEYESNO=1
|
|
|
fcGetYesNo
|
|
|
if [ "$VALUEYESNO" = "1" ];
|