added option web - only - to PYROS_DOCKER_RUN

Etienne Pallier
1 parent 10ebce4d
Showing 3 changed files with 17 additions and 7 deletions Show diff stats
docker/PYROS_DOCKER_RUN
docker/PYROS_DOCKER_UPDATE_AND_RESTART
docker/PYROS_DOCKER_UPDATE_AND_RESTART.bat
@@ -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 &quot;cd simulators/plc/ ; ./plcSimulator.py&quot; &gt; ../../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
  
  
@@ -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
 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