[UPDATE] - diff oracle/centos

This commit is contained in:
2022-10-20 17:31:15 +02:00
parent 66d98e5400
commit 47b2d87487
4 changed files with 30 additions and 6 deletions
+5 -3
View File
@@ -54,9 +54,11 @@ DeleteFile() {
DockerConnect() {
User=esl
[[ "$2" == "root" ]] && User='root'
Inst=$(docker ps|grep "esl-$1" | awk '{print $NF}')
[[ -L $(realpath $(dirname $0))/cible ]] && Cible="-v $(realpath $(dirname $0))/cible:/data/cible"
[[ -z "${Inst}" ]] && docker run -ti -v $(realpath $(dirname $0))/data:/data -v $(realpath $(dirname $0))/data/log:/log ${Cible} --hostname $1 -u esl esl\-${1}:2 bash || docker exec -ti ${Inst} bash
[[ -z "${Inst}" ]] && docker run -ti -v $(realpath $(dirname $0))/data:/data -v $(realpath $(dirname $0))/data/log:/log ${Cible} --hostname $1 -u ${User} esl\-${1}:2 bash || docker exec -ti -u $User ${Inst} bash
echo DEBUG $Inst $1
}
@@ -86,7 +88,7 @@ DeleteImg () {
DockerGen() {
DeleteImg $1
echo -n "generate Dockerfile $1 ... : "
echo -n "generate Dockerfile $1 $Cible... : "
source define.conf
while read line
do
@@ -96,7 +98,7 @@ DockerGen() {
else
echo $line
fi
done < Template/Dockerfile.$1 > Dockerfile
done < Template/Dockerfile.${1}.${Cible} > Dockerfile
Res $?
echo -n "Generate $1 Docker image ... : "