diff --git a/Template/function b/Template/function index 9b7b1af..0939d65 100755 --- a/Template/function +++ b/Template/function @@ -25,15 +25,16 @@ help () { echo " $0 [image/repo/esl/all] - * image : Generate docker images - * image-gen : Generate docker image for esl compilator - * image-repo : Generate docker image for repository sync - * repo : start docker compose and generate repositories - * gen : start docker compose and generarte esl - * all : Do everything - * run-gen : Connect and run bash on instance gen - * run-repo : Connect and run bash on instance repo - * stop : stop all docker image + * $(tput setaf 3)image $(tput sgr0): Generate docker images + * $(tput setaf 3)image-gen $(tput sgr0): Generate docker image for esl compilator + * $(tput setaf 3)image-repo $(tput sgr0): Generate docker image for repository sync + * $(tput setaf 4)repo $(tput sgr0): start docker compose and generate repositories + * $(tput setaf 4)gen $(tput sgr0): start docker compose and generarte esl + * $(tput setaf 1)all $(tput sgr0): Do everything + * $(tput setaf 2)run-gen $(tput sgr0): Connect and run bash on instance gen + * $(tput setaf 2)run-repo $(tput sgr0): Connect and run bash on instance repo + * $(tput setaf 2)stop $(tput sgr0): stop all docker image + * $(tput setaf 5)ps $(tput sgr0): print all docker image " exit @@ -57,6 +58,13 @@ DockerConnect() { docker exec -ti ${Inst} bash } +DockerPs() { + + docker ps|grep $(dirname .)_esl\-$1 | awk '{print $NF}' + +} + + DockerStop() { for DockerRun in $(docker ps|grep $(dirname .)_esl\- | awk '{print $NF}') diff --git a/generate_env.sh b/generate_env.sh index c2f1202..a0099ff 100755 --- a/generate_env.sh +++ b/generate_env.sh @@ -18,15 +18,12 @@ Exec=$1 [[ "${Exec}" == "image" ]] && GenAll [[ "${Exec}" == "image-gen" ]] && DockerGen gen [[ "${Exec}" == "image-repo" ]] && DockerGen repo - - - - [[ "${Exec}" == "repo" ]] && DockerComposeRun repo [[ "${Exec}" == "stop" ]] && DockerStop [[ "${Exec}" == "gen" ]] && DockerComposeRun gen [[ "${Exec}" == "run-gen" ]] && DockerConnect gen [[ "${Exec}" == "run-repo" ]] && DockerConnect repo +[[ "${Exec}" == "ps" ]] && DockerPs if [[ "${Exec}" == "all" ]]