[UPDATE] - test from scratch

This commit is contained in:
Guillaume Astier 2021-12-10 17:04:11 +01:00
parent a042dea4fe
commit b1fb3753ad
7 changed files with 40 additions and 14 deletions

View File

@ -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}

View File

@ -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}

View File

@ -1,7 +1,7 @@
#!/bin/bash
if [[ -x $1 ]]
if [[ -x "$1" ]]
then
$1
exit $?

View File

@ -22,7 +22,7 @@ WhileTrue() {
}
if [[ $1 == "debug" ]] && WhileTrue
[[ $1 == "debug" ]] && WhileTrue
[[ $1 == "del" ]] && rm -Rf /data/repo /data/log

View File

@ -2,8 +2,8 @@ version: '2'
services:
compil:
image: esl-compilator:${GenVers}
esl-gen:
image: esl-gen:${GenVers}
volumes:
- ${ProgrammeDir}:/data
- ${RepoDir}:/data/distributions

View File

@ -2,8 +2,8 @@ version: '2'
services:
c7repo:
image: c7repo:${RepoVers}
esl-repo:
image: esl-repo:${RepoVers}
volumes:
- ./data:/data

View File

@ -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