Commit b1e4e4dd449dc33cec14dc26815c1b29d1a6d343

Authored by Etienne Pallier
1 parent 2da110b4
Exists in dev

Renamed scripts PYROS_DOCKER_BUILD.sh => PYROS_DOCKER_BUILD and PYROS_DOCKER_STA…

…RT.sh => PYROS_DOCKER_START
docker/PYROS_DOCKER_BUILD.sh renamed to docker/PYROS_DOCKER_BUILD
docker/PYROS_DOCKER_INSTALL
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 # if no container is running 3 # if no container is running
4 if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 4 ] ; then 4 if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 4 ] ; then
5 echo "pyros-db or pyros weren't running, starting them..." 5 echo "pyros-db or pyros weren't running, starting them..."
6 - ./PYROS_DOCKER_START.sh 6 + ./PYROS_DOCKER_START
7 #./PYROS_DOCKER_START.bat 7 #./PYROS_DOCKER_START.bat
8 fi 8 fi
9 9
docker/PYROS_DOCKER_RUN
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 4 ] 4 if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 4 ]
5 then 5 then
6 echo "pyros-db or pyros weren't running, starting them..." 6 echo "pyros-db or pyros weren't running, starting them..."
7 - ./PYROS_DOCKER_START.sh 7 + ./PYROS_DOCKER_START
8 #./PYROS_DOCKER_START.bat 8 #./PYROS_DOCKER_START.bat
9 fi 9 fi
10 10
docker/PYROS_DOCKER_RUN_WEBSERVER_ONLY
@@ -3,7 +3,8 @@ @@ -3,7 +3,8 @@
3 #if no container is running 3 #if no container is running
4 if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 4 ] ; then 4 if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 4 ] ; then
5 echo "pyros-db or pyros weren't running, starting them..." 5 echo "pyros-db or pyros weren't running, starting them..."
6 - ./PYROS_DOCKER_START.bat 6 + ./PYROS_DOCKER_START
  7 + #./PYROS_DOCKER_START.bat
7 fi 8 fi
8 9
9 docker compose exec pyros python3 pyros.py -d start webserver $@ 10 docker compose exec pyros python3 pyros.py -d start webserver $@
docker/PYROS_DOCKER_SHELL
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 4 ] 4 if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 4 ]
5 then 5 then
6 echo "pyros-db or pyros weren't running, starting them..." 6 echo "pyros-db or pyros weren't running, starting them..."
7 - ./PYROS_DOCKER_START.sh 7 + ./PYROS_DOCKER_START
8 #./PYROS_DOCKER_START.bat 8 #./PYROS_DOCKER_START.bat
9 fi 9 fi
10 docker compose exec pyros bash $@ 10 docker compose exec pyros bash $@
docker/PYROS_DOCKER_START.sh renamed to docker/PYROS_DOCKER_START
docker/PYROS_DOCKER_TEST
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 4 ] 4 if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 4 ]
5 then 5 then
6 echo "pyros-db or pyros weren't running, starting them..." 6 echo "pyros-db or pyros weren't running, starting them..."
7 - ./PYROS_DOCKER_START.sh 7 + ./PYROS_DOCKER_START
8 #./PYROS_DOCKER_START.bat 8 #./PYROS_DOCKER_START.bat
9 fi 9 fi
10 docker compose exec pyros python3 pyros.py test $@ 10 docker compose exec pyros python3 pyros.py test $@
docker/PYROS_DOCKER_UPDATE
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 4 ] 4 if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 4 ]
5 then 5 then
6 echo "pyros-db or pyros weren't running, starting them..." 6 echo "pyros-db or pyros weren't running, starting them..."
7 - ./PYROS_DOCKER_START.sh 7 + ./PYROS_DOCKER_START
8 #./PYROS_DOCKER_START.bat 8 #./PYROS_DOCKER_START.bat
9 fi 9 fi
10 10