PYROS-IRAP / pyros

Commit da7c081d32807127d36aac8e3c78ea72705ce50d

Authored by Alexis Koralewski
1 parent e1e75163
Exists in dev

remove extension from PYROS_DOCKER bash scripts

Showing 5 changed files with 10 additions and 1 deletions   Show diff stats
Inline Side-by-side
docker/PYROS_DOCKER_INSTALL.sh renamed to docker/PYROS_DOCKER_INSTALL
  Diff comments   View file @da7c081
@@ -3,9 +3,14 @@ @@ -3,9 +3,14 @@
3 # if no container is running 3 # if no container is running
4 if ! docker ps | grep -q 'db_pyros|pyros' 4 if ! docker ps | grep -q 'db_pyros|pyros'
5 then 5 then
  6 + echo "db_pyros or pyros weren't running, starting them..."
6 ./PYROS_DOCKER_START.bat 7 ./PYROS_DOCKER_START.bat
7 fi 8 fi
8 # while db container isn't ready to execute queries, wait 5 seconds 9 # while db container isn't ready to execute queries, wait 5 seconds
  10 +if ! docker inspect db_pyros --format='{{.State.Health.Status}}' | grep -q 'healthy'
  11 +then
  12 + echo "db service isn't ready yet, waiting until it's ready..."
  13 +fi
9 while ! docker inspect db_pyros --format='{{.State.Health.Status}}' | grep -q 'healthy' 14 while ! docker inspect db_pyros --format='{{.State.Health.Status}}' | grep -q 'healthy'
10 do 15 do
11 sleep 5 16 sleep 5
docker/PYROS_DOCKER_RUN.sh renamed to docker/PYROS_DOCKER_RUN
  Diff comments   View file @da7c081
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
3 #if no container is running 3 #if no container is running
4 if ! docker ps | grep -q 'db_pyros|pyros' 4 if ! docker ps | grep -q 'db_pyros|pyros'
5 then 5 then
  6 + echo "db_pyros or pyros weren't running, starting them..."
6 ./PYROS_DOCKER_START.bat 7 ./PYROS_DOCKER_START.bat
7 fi 8 fi
8 docker exec -it pyros python3 pyros.py start webserver 9 docker exec -it pyros python3 pyros.py start webserver
docker/PYROS_DOCKER_SHELL.sh renamed to docker/PYROS_DOCKER_SHELL
  Diff comments   View file @da7c081
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
3 #if no container is running 3 #if no container is running
4 if ! docker ps | grep -q 'db_pyros|pyros' 4 if ! docker ps | grep -q 'db_pyros|pyros'
5 then 5 then
  6 + echo "db_pyros or pyros weren't running, starting them..."
6 ./PYROS_DOCKER_START.bat 7 ./PYROS_DOCKER_START.bat
7 fi 8 fi
8 docker exec -it pyros bash 9 docker exec -it pyros bash
9 \ No newline at end of file 10 \ No newline at end of file
docker/PYROS_DOCKER_TEST.sh renamed to docker/PYROS_DOCKER_TEST
  Diff comments   View file @da7c081
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
3 # if no container is running 3 # if no container is running
4 if ! docker ps | grep -q 'db_pyros|pyros' 4 if ! docker ps | grep -q 'db_pyros|pyros'
5 then 5 then
  6 + echo "db_pyros or pyros weren't running, starting them..."
6 ./PYROS_DOCKER_START.bat 7 ./PYROS_DOCKER_START.bat
7 fi 8 fi
8 docker exec -it pyros python3 pyros.py test 9 docker exec -it pyros python3 pyros.py test
docker/PYROS_DOCKER_UPDATE.sh renamed to docker/PYROS_DOCKER_UPDATE
  Diff comments   View file @da7c081
@@ -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 -q 'db_pyros|pyros' 4 if ! docker ps | grep -q 'db_pyros|pyros'
5 then 5 then
6 - ./PYROS_DOCKER_START.bat 6 + echo "db_pyros or pyros weren't running, starting them..."
  7 + ./PYROS_DOCKER_START.bat
7 fi 8 fi
8 docker exec -it pyros python3 pyros.py update 9 docker exec -it pyros python3 pyros.py update
9 10