From 085e388b16c5b589bae308f869bacb5b142aecf4 Mon Sep 17 00:00:00 2001
From: Etienne Pallier <epallier@irap.omp.eu>
Date: Wed, 6 Oct 2021 10:16:21 +0200
Subject: [PATCH] added option web - only - to PYROS_DOCKER_RUN

---
 docker/PYROS_DOCKER_RUN                    | 11 +++++++++++
 docker/PYROS_DOCKER_UPDATE_AND_RESTART     |  6 +++---
 docker/PYROS_DOCKER_UPDATE_AND_RESTART.bat |  7 +++----
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/docker/PYROS_DOCKER_RUN b/docker/PYROS_DOCKER_RUN
index af54485..c6ab27b 100755
--- a/docker/PYROS_DOCKER_RUN
+++ b/docker/PYROS_DOCKER_RUN
@@ -14,6 +14,12 @@ fi
 #docker exec pyros python3 pyros.py start webserver $@ > ../../LOG_PYROS_webserver.log 2>&1 &
 docker exec pyros python3 pyros.py start -o tnc webserver > ../../LOG_PYROS_webserver.log 2>&1 &
 
+# exit if webserver only
+#[[ $1 == "web" ]] && exit
+
+# Go on only if not "web"
+if [[ $1 != "web" ]] ; then
+
 # 2) PLC simulator
 # - Display log on current terminal
 #docker exec -it pyros bash -c "cd simulators/plc/ ; ./plcSimulator.py"
@@ -26,7 +32,12 @@ docker exec pyros bash -c "cd simulators/plc/ ; ./plcSimulator.py" > ../../LOG_P
 # - Save log in file
 docker exec pyros python3 pyros.py start agentM > ../../LOG_PYROS_agent_monitoring.log 2>&1 &
 
+fi
+
+
+
 # SEE ALL PROCESSES LAUNCHED
+sleep 3
 ./KILL_PYROS_DOCKER_RUN no
 
 
diff --git a/docker/PYROS_DOCKER_UPDATE_AND_RESTART b/docker/PYROS_DOCKER_UPDATE_AND_RESTART
index f9ab480..f55e3c4 100755
--- a/docker/PYROS_DOCKER_UPDATE_AND_RESTART
+++ b/docker/PYROS_DOCKER_UPDATE_AND_RESTART
@@ -12,9 +12,9 @@ abort() {
 }
 
 # 1) Stop
-# kill twice to be sure it's really dead !
 ./KILL_PYROS_DOCKER_RUN || abort "Could not kill"
-./KILL_PYROS_DOCKER_RUN
+# kill twice to be sure it's really dead !
+#./KILL_PYROS_DOCKER_RUN
 
 # 2) Update
 ./PYROS_DOCKER_UPDATE || abort "Could not update"
@@ -23,7 +23,7 @@ abort() {
 ./PYROS_DOCKER_TEST || abort "TESTS KO"
 
 # 4) Start again
-./PYROS_DOCKER_RUN || abort "Could not run"
+./PYROS_DOCKER_RUN $1 || abort "Could not run"
 
 # See what's running
 ./KILL_PYROS_DOCKER_RUN no
diff --git a/docker/PYROS_DOCKER_UPDATE_AND_RESTART.bat b/docker/PYROS_DOCKER_UPDATE_AND_RESTART.bat
index 46b3d10..94629ed 100755
--- a/docker/PYROS_DOCKER_UPDATE_AND_RESTART.bat
+++ b/docker/PYROS_DOCKER_UPDATE_AND_RESTART.bat
@@ -1,9 +1,8 @@
 KILL_PYROS_DOCKER_RUN
-KILL_PYROS_DOCKER_RUN
 
-./PYROS_DOCKER_UPDATE
+PYROS_DOCKER_UPDATE
 
-./PYROS_DOCKER_TEST
+PYROS_DOCKER_TEST
 
-./PYROS_DOCKER_RUN
+PYROS_DOCKER_RUN
 
--
libgit2 0.21.2