update conf & theme & script

DOCKER/README.md

@@ -21,10 +21,10 @@ mv docker-compose-linux-x86_64 /bin/docker-compose
 
 # DEBUG 
 
-## Build isen-gen-exam
+## Build pandoc-gen-file-isen
 
 ```
-docker build . -t pandoc-gen-file
+docker build . -t pandoc-gen-file-isen
 ```
 
 ## Start conversion

DOCKER/docker-compose.yml

@@ -1,7 +1,7 @@
 services:
   gen-doc:
     user: "1000:1000"
-    image: pandoc-gen-file
+    image: pandoc-gen-file-isen
     volumes:
       - ../:/data
 

DOCKER/run_conversion.sh

@@ -1,12 +1,6 @@
 #!/bin/bash
 
 
-while [[ -f /data/lock ]]
-	do
-		sleep 1
-	done
-
-
 source /data/CONF/config
 cd /data/IN
 
@@ -23,7 +17,6 @@ for File in $(find . -name "*.md")
 		Title=$(echo $OutFile | sed 's/_/ /g' | sed 's/.pdf//g')
 		echo -n "$Title : "
 
-	        dos2unix ./${InFile} &> /dev/null
 		cat  ../CONF/header | sed "s/___NAME___/${Name}/g" | sed "s/___TITLE___/${Title}/g" | sed "s/___DATE___/${Date}/g" >  ./${InFile}.better
 		cat ./${InFile}  >> ./${InFile}.better
 		pandoc --from markdown --pdf-engine=xelatex --template "${ThemePDFNameCours}" --toc-depth 2   --listings --toc -o ../OUT/${OutFile} ./${InFile}.better &> /dev/null

run.sh

@@ -1,19 +1,16 @@
 #!/bin/bash
 
-cd DOCKER
-
 if [[ $1 == "gen" ]]
 	then
 		echo "it's Gonna Take a Little Bit Longer .... "
 		echo -e "UID=$(id -u)\nGID=$(id -g)" > .env
-		echo -n "Running generation of isen-gen-exam docker image : "
-		docker build . --no-cache -t isen-gen-exam &> /dev/null
+		#docker build . --no-cache -t pandoc-gen-file-isen &> /dev/null
+		docker build .  -t pandoc-gen-file-isen
 		[[ "$?" -ne 0 ]] && echo FAILED || echo OK
 		exit
 fi
 
-
-if [[ -z $(docker image ls | grep isen-gen-exam) ]]
+if [[ -z $(docker image ls | grep pandoc-gen-file-isen) ]]
 then
 	echo "NO IMAGE : $0 gen"
 	exit 2
@@ -21,15 +18,12 @@ fi
 
 if [[ $1 == "debug" ]]
 	then 
-		touch .tmp 
-		echo "Connect to another terminal and type : docker exec -ti isen-gen-exam bash"
+		echo "Connect to another terminal and type : docker exec -ti pandoc-gen-file-isen bash"
 		echo "When the debug is finished '[CTRL+C] here'"
-		docker-compose up &> /dev/null
+		docker run -ti -v $(pwd):/data -u 1000 pandoc-gen-file-isen bash
 	else 
-		echo "START GenPanDoc"
-		docker-compose up 2>&1 | grep 'gen-doc_1  |'|cut -d"|" -f2 | sed "s/^/\t* /g"
+		cd $(realpath $(dirname $0))/DOCKER
+		docker-compose up 
 	fi
-echo -n "STOP GenPanDoc : "
-docker-compose down  &> /dev/null
-[[ $? -eq 0 ]] && echo OK || echo FAILED
+docker-compose down
 [[ -f ../.tmp ]] && rm ../.tmp