diff --git a/DockerFile/Dockerfile.gen b/DockerFile/Dockerfile.gen index 6f8604c..6c161e0 100644 --- a/DockerFile/Dockerfile.gen +++ b/DockerFile/Dockerfile.gen @@ -12,5 +12,6 @@ RUN yum install -y net-snmp COPY ./bin/run.sh /bin/run.sh RUN chmod 777 /bin/run.sh -CMD [/bin/run.sh ${Run}] +#CMD [/bin/run.sh ${Run}] +CMD /bin/run.sh ${Run} diff --git a/DockerFile/Dockerfile.repo b/DockerFile/Dockerfile.repo index a21f1aa..bf793d7 100644 --- a/DockerFile/Dockerfile.repo +++ b/DockerFile/Dockerfile.repo @@ -12,4 +12,5 @@ RUN chmod 755 /bin/sync.sh COPY ./bin/empty.sh /bin/empty.sh RUN chmod 755 /bin/empty.sh -CMD [${Run} ${RunArg}] +#CMD [${Run} ${RunArg}] +CMD ${Run} ${RunArg} diff --git a/bin/run.sh b/bin/run.sh index ff3a2ba..b434169 100644 --- a/bin/run.sh +++ b/bin/run.sh @@ -1,7 +1,7 @@ #!/bin/bash -if [[ -x $1 ]] +if [[ -x "$1" ]] then $1 exit $? diff --git a/bin/sync.sh b/bin/sync.sh index f053ce0..3425d56 100755 --- a/bin/sync.sh +++ b/bin/sync.sh @@ -22,7 +22,7 @@ WhileTrue() { } -if [[ $1 == "debug" ]] && WhileTrue +[[ $1 == "debug" ]] && WhileTrue [[ $1 == "del" ]] && rm -Rf /data/repo /data/log diff --git a/docker-compose.yml.esl b/docker-compose.yml.gen similarity index 70% rename from docker-compose.yml.esl rename to docker-compose.yml.gen index bea4634..1fac51e 100644 --- a/docker-compose.yml.esl +++ b/docker-compose.yml.gen @@ -2,8 +2,8 @@ version: '2' services: - compil: - image: esl-compilator:${GenVers} + esl-gen: + image: esl-gen:${GenVers} volumes: - ${ProgrammeDir}:/data - ${RepoDir}:/data/distributions diff --git a/docker-compose.yml.repo b/docker-compose.yml.repo index 26eb9cb..a95f033 100644 --- a/docker-compose.yml.repo +++ b/docker-compose.yml.repo @@ -2,8 +2,8 @@ version: '2' services: - c7repo: - image: c7repo:${RepoVers} + esl-repo: + image: esl-repo:${RepoVers} volumes: - ./data:/data diff --git a/generate_env.sh b/generate_env.sh index 0c1f305..ffcdd28 100755 --- a/generate_env.sh +++ b/generate_env.sh @@ -31,8 +31,11 @@ $0 [image/repo/esl/all] * image-gen : Generate docker image for esl compilator * image-repo : Generate docker image for repository sync * repo : start docker compose and generate repositories - * esl : start docker compose and generarte esl + * 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 " exit @@ -58,6 +61,23 @@ DeleteFile() { [[ -f ${Wai}/Dockerfile ]] && rm Dockerfile || true Res $? + +} + +DockerConnect() { + + Inst=$(docker ps|grep $(dirname .)_esl\-$1 | awk '{print $NF}') + docker exec -ti ${Inst} bash + +} + +DockerStop() { + for DockerRun in $(docker ps|grep $(dirname .)_esl\- | awk '{print $NF}') + do + echo -n "Stop $DockerRun ... :" + docker stop $DockerRun &> /dev/null + Res $? + done } DeleteImg () { @@ -96,9 +116,10 @@ DockerGen() { DockerComposeRun () { - [[ $2 == "Print" ]] && Print="" || Print="-d" + + [[ "$2" == "Print" ]] && Print="-d" || Print="" echo -n "Starting DOCKER $1 ... : " - docker-compose -f docker-compose.yml.$1 up ${Print} --remove-orphans 2>&1 | tee /tmp/RunDocker-${1}.log &> /dev/null + yes | docker-compose -f docker-compose.yml.$1 up ${Print} --remove-orphans 2>&1 | tee /tmp/RunDocker-${1}.log &> /dev/null Res $? echo " --------- Log Esl ----------- @@ -123,13 +144,16 @@ GenAll () { -[[ "${Exec}" == "repo" ]] && DockerComposeRun repo -[[ "${Exec}" == "gen" ]] && DockerComposeRun gen +[[ "${Exec}" == "repo" ]] && DockerComposeRun repo Print +[[ "${Exec}" == "stop" ]] && DockerStop +[[ "${Exec}" == "gen" ]] && DockerComposeRun gen Print +[[ "${Exec}" == "run-gen" ]] && DockerConnect gen +[[ "${Exec}" == "run-repo" ]] && DockerConnect repo if [[ "${Exec}" == "all" ]] then - DockerGen + GenAll DockerComposeRun repo Print DockerComposeRun gen Print fi