[UPDATE] - test from scratch
This commit is contained in:
parent
a042dea4fe
commit
b1fb3753ad
@ -12,5 +12,6 @@ RUN yum install -y net-snmp
|
|||||||
|
|
||||||
COPY ./bin/run.sh /bin/run.sh
|
COPY ./bin/run.sh /bin/run.sh
|
||||||
RUN chmod 777 /bin/run.sh
|
RUN chmod 777 /bin/run.sh
|
||||||
CMD [/bin/run.sh ${Run}]
|
#CMD [/bin/run.sh ${Run}]
|
||||||
|
CMD /bin/run.sh ${Run}
|
||||||
|
|
||||||
|
|||||||
@ -12,4 +12,5 @@ RUN chmod 755 /bin/sync.sh
|
|||||||
COPY ./bin/empty.sh /bin/empty.sh
|
COPY ./bin/empty.sh /bin/empty.sh
|
||||||
RUN chmod 755 /bin/empty.sh
|
RUN chmod 755 /bin/empty.sh
|
||||||
|
|
||||||
CMD [${Run} ${RunArg}]
|
#CMD [${Run} ${RunArg}]
|
||||||
|
CMD ${Run} ${RunArg}
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
|
|
||||||
if [[ -x $1 ]]
|
if [[ -x "$1" ]]
|
||||||
then
|
then
|
||||||
$1
|
$1
|
||||||
exit $?
|
exit $?
|
||||||
|
|||||||
@ -22,7 +22,7 @@ WhileTrue() {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if [[ $1 == "debug" ]] && WhileTrue
|
[[ $1 == "debug" ]] && WhileTrue
|
||||||
|
|
||||||
[[ $1 == "del" ]] && rm -Rf /data/repo /data/log
|
[[ $1 == "del" ]] && rm -Rf /data/repo /data/log
|
||||||
|
|
||||||
|
|||||||
@ -2,8 +2,8 @@ version: '2'
|
|||||||
|
|
||||||
|
|
||||||
services:
|
services:
|
||||||
compil:
|
esl-gen:
|
||||||
image: esl-compilator:${GenVers}
|
image: esl-gen:${GenVers}
|
||||||
volumes:
|
volumes:
|
||||||
- ${ProgrammeDir}:/data
|
- ${ProgrammeDir}:/data
|
||||||
- ${RepoDir}:/data/distributions
|
- ${RepoDir}:/data/distributions
|
||||||
@ -2,8 +2,8 @@ version: '2'
|
|||||||
|
|
||||||
|
|
||||||
services:
|
services:
|
||||||
c7repo:
|
esl-repo:
|
||||||
image: c7repo:${RepoVers}
|
image: esl-repo:${RepoVers}
|
||||||
volumes:
|
volumes:
|
||||||
- ./data:/data
|
- ./data:/data
|
||||||
|
|
||||||
|
|||||||
@ -31,8 +31,11 @@ $0 [image/repo/esl/all]
|
|||||||
* image-gen : Generate docker image for esl compilator
|
* image-gen : Generate docker image for esl compilator
|
||||||
* image-repo : Generate docker image for repository sync
|
* image-repo : Generate docker image for repository sync
|
||||||
* repo : start docker compose and generate repositories
|
* repo : start docker compose and generate repositories
|
||||||
* esl : start docker compose and generarte esl
|
* gen : start docker compose and generarte esl
|
||||||
* all : Do everything
|
* 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
|
exit
|
||||||
@ -58,6 +61,23 @@ DeleteFile() {
|
|||||||
[[ -f ${Wai}/Dockerfile ]] && rm Dockerfile || true
|
[[ -f ${Wai}/Dockerfile ]] && rm Dockerfile || true
|
||||||
Res $?
|
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 () {
|
DeleteImg () {
|
||||||
@ -96,9 +116,10 @@ DockerGen() {
|
|||||||
|
|
||||||
|
|
||||||
DockerComposeRun () {
|
DockerComposeRun () {
|
||||||
[[ $2 == "Print" ]] && Print="" || Print="-d"
|
|
||||||
|
[[ "$2" == "Print" ]] && Print="-d" || Print=""
|
||||||
echo -n "Starting DOCKER $1 ... : "
|
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 $?
|
Res $?
|
||||||
echo "
|
echo "
|
||||||
--------- Log Esl -----------
|
--------- Log Esl -----------
|
||||||
@ -123,13 +144,16 @@ GenAll () {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
[[ "${Exec}" == "repo" ]] && DockerComposeRun repo
|
[[ "${Exec}" == "repo" ]] && DockerComposeRun repo Print
|
||||||
[[ "${Exec}" == "gen" ]] && DockerComposeRun gen
|
[[ "${Exec}" == "stop" ]] && DockerStop
|
||||||
|
[[ "${Exec}" == "gen" ]] && DockerComposeRun gen Print
|
||||||
|
[[ "${Exec}" == "run-gen" ]] && DockerConnect gen
|
||||||
|
[[ "${Exec}" == "run-repo" ]] && DockerConnect repo
|
||||||
|
|
||||||
|
|
||||||
if [[ "${Exec}" == "all" ]]
|
if [[ "${Exec}" == "all" ]]
|
||||||
then
|
then
|
||||||
DockerGen
|
GenAll
|
||||||
DockerComposeRun repo Print
|
DockerComposeRun repo Print
|
||||||
DockerComposeRun gen Print
|
DockerComposeRun gen Print
|
||||||
fi
|
fi
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user