Commit ec4214ffc5990beb8f88152c826d43c92fcd7aa6
1 parent
4faed281
Exists in
dev
Renaming pyros containers (pma & db)
Showing
9 changed files
with
18 additions
and
15 deletions
Show diff stats
CHANGELOG
docker/PYROS_DOCKER_INSTALL
... | ... | @@ -3,19 +3,19 @@ |
3 | 3 | # if no container is running |
4 | 4 | if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 2 ] |
5 | 5 | then |
6 | - echo "db_pyros or pyros weren't running, starting them..." | |
6 | + echo "pyros-db or pyros weren't running, starting them..." | |
7 | 7 | ./PYROS_DOCKER_START.bat |
8 | 8 | fi |
9 | 9 | |
10 | 10 | # while db container isn't ready to execute queries, wait 5 seconds |
11 | -if ! docker inspect db_pyros --format='{{.State.Health.Status}}' | grep -q 'healthy' | |
11 | +if ! docker inspect pyros-db --format='{{.State.Health.Status}}' | grep -q 'healthy' | |
12 | 12 | then |
13 | 13 | echo "db service isn't ready yet, waiting until it's ready..." |
14 | 14 | fi |
15 | -while ! docker inspect db_pyros --format='{{.State.Health.Status}}' | grep -q 'healthy' | |
15 | +while ! docker inspect pyros-db --format='{{.State.Health.Status}}' | grep -q 'healthy' | |
16 | 16 | do |
17 | 17 | sleep 5 |
18 | - heal_status=$(docker inspect db_pyros --format='{{.State.Health.Status}}') | |
18 | + heal_status=$(docker inspect pyros-db --format='{{.State.Health.Status}}') | |
19 | 19 | echo "Current status : $heal_status" |
20 | 20 | done |
21 | 21 | ... | ... |
docker/PYROS_DOCKER_RUN
1 | 1 | #!/usr/bin/env bash |
2 | 2 | |
3 | 3 | #if no container is running |
4 | -if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 2 ] | |
4 | +if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 3 ] | |
5 | 5 | then |
6 | - echo "db_pyros or pyros weren't running, starting them..." | |
6 | + echo "pyros-db or pyros weren't running, starting them..." | |
7 | 7 | ./PYROS_DOCKER_START.bat |
8 | 8 | fi |
9 | 9 | ... | ... |
docker/PYROS_DOCKER_RUN_WEBSERVER_ONLY
1 | 1 | #!/usr/bin/env bash |
2 | 2 | |
3 | 3 | #if no container is running |
4 | -if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 2 ] | |
4 | +if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 3 ] | |
5 | 5 | then |
6 | - echo "db_pyros or pyros weren't running, starting them..." | |
6 | + echo "pyros-db or pyros weren't running, starting them..." | |
7 | 7 | ./PYROS_DOCKER_START.bat |
8 | 8 | fi |
9 | 9 | docker exec -it pyros python3 pyros.py -d start webserver $@ |
10 | 10 | #docker exec -it pyros python3 pyros.py start webserver $@ |
11 | 11 | #docker exec -it pyros python3 pyros.py -d start -o tnc webserver $@ |
12 | - | |
12 | +s | ... | ... |
docker/PYROS_DOCKER_SHELL
... | ... | @@ -3,7 +3,7 @@ |
3 | 3 | #if no container is running |
4 | 4 | if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 2 ] |
5 | 5 | then |
6 | - echo "db_pyros or pyros weren't running, starting them..." | |
6 | + echo "pyros-db or pyros weren't running, starting them..." | |
7 | 7 | ./PYROS_DOCKER_START.bat |
8 | 8 | fi |
9 | 9 | docker exec -it pyros bash $@ | ... | ... |
docker/PYROS_DOCKER_TEST
... | ... | @@ -3,7 +3,7 @@ |
3 | 3 | # if no container is running |
4 | 4 | if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 2 ] |
5 | 5 | then |
6 | - echo "db_pyros or pyros weren't running, starting them..." | |
6 | + echo "pyros-db or pyros weren't running, starting them..." | |
7 | 7 | ./PYROS_DOCKER_START.bat |
8 | 8 | fi |
9 | 9 | docker exec -it pyros python3 pyros.py test $@ | ... | ... |
docker/PYROS_DOCKER_UPDATE
1 | 1 | #!/usr/bin/env bash |
2 | 2 | |
3 | 3 | # If no container is running Start it |
4 | -if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 2 ] | |
4 | +if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 3 ] | |
5 | 5 | then |
6 | - echo "db_pyros or pyros weren't running, starting them..." | |
6 | + echo "pyros-db or pyros weren't running, starting them..." | |
7 | 7 | ./PYROS_DOCKER_START.bat |
8 | 8 | fi |
9 | 9 | ... | ... |
docker/docker-compose.yml
... | ... | @@ -7,7 +7,7 @@ services: |
7 | 7 | image: mysql:8.0.28 |
8 | 8 | command: --default-authentication-plugin=mysql_native_password |
9 | 9 | restart: always |
10 | - container_name: db_pyros | |
10 | + container_name: pyros-db | |
11 | 11 | environment: |
12 | 12 | # note : as db is an image of mysql, this root password will be set on the first installation on the image, if the value is changed, it will not be updated in the database |
13 | 13 | - "MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-root}" |
... | ... | @@ -69,7 +69,7 @@ services: |
69 | 69 | restart: always |
70 | 70 | phpmyadmin: |
71 | 71 | image: phpmyadmin/phpmyadmin |
72 | - container_name: pma | |
72 | + container_name: pyros-pma | |
73 | 73 | links: |
74 | 74 | - db |
75 | 75 | environment: | ... | ... |