From ec4214ffc5990beb8f88152c826d43c92fcd7aa6 Mon Sep 17 00:00:00 2001 From: Alexis Koralewski Date: Mon, 12 Dec 2022 13:28:44 +0100 Subject: [PATCH] Renaming pyros containers (pma & db) --- CHANGELOG | 3 +++ docker/PYROS_DOCKER_BUILD.sh | 0 docker/PYROS_DOCKER_INSTALL | 8 ++++---- docker/PYROS_DOCKER_RUN | 4 ++-- docker/PYROS_DOCKER_RUN_WEBSERVER_ONLY | 6 +++--- docker/PYROS_DOCKER_SHELL | 2 +- docker/PYROS_DOCKER_TEST | 2 +- docker/PYROS_DOCKER_UPDATE | 4 ++-- docker/docker-compose.yml | 4 ++-- 9 files changed, 18 insertions(+), 15 deletions(-) mode change 100644 => 100755 docker/PYROS_DOCKER_BUILD.sh diff --git a/CHANGELOG b/CHANGELOG index 9e93d40..5738c2c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +12-12-2022 (AKo): v0.6.15.3 + - Renaming pyros containers (pma & db) + 08-12-2022 (AKo): v0.6.15.3 - Catch integretyerror (sequence name unique) when submitting seq file diff --git a/docker/PYROS_DOCKER_BUILD.sh b/docker/PYROS_DOCKER_BUILD.sh old mode 100644 new mode 100755 index 8b1ae6b..8b1ae6b --- a/docker/PYROS_DOCKER_BUILD.sh +++ b/docker/PYROS_DOCKER_BUILD.sh diff --git a/docker/PYROS_DOCKER_INSTALL b/docker/PYROS_DOCKER_INSTALL index 9ac7ae3..0c883cd 100755 --- a/docker/PYROS_DOCKER_INSTALL +++ b/docker/PYROS_DOCKER_INSTALL @@ -3,19 +3,19 @@ # if no container is running if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 2 ] then - echo "db_pyros or pyros weren't running, starting them..." + echo "pyros-db or pyros weren't running, starting them..." ./PYROS_DOCKER_START.bat fi # while db container isn't ready to execute queries, wait 5 seconds -if ! docker inspect db_pyros --format='{{.State.Health.Status}}' | grep -q 'healthy' +if ! docker inspect pyros-db --format='{{.State.Health.Status}}' | grep -q 'healthy' then echo "db service isn't ready yet, waiting until it's ready..." fi -while ! docker inspect db_pyros --format='{{.State.Health.Status}}' | grep -q 'healthy' +while ! docker inspect pyros-db --format='{{.State.Health.Status}}' | grep -q 'healthy' do sleep 5 - heal_status=$(docker inspect db_pyros --format='{{.State.Health.Status}}') + heal_status=$(docker inspect pyros-db --format='{{.State.Health.Status}}') echo "Current status : $heal_status" done diff --git a/docker/PYROS_DOCKER_RUN b/docker/PYROS_DOCKER_RUN index e2049a9..c2a365b 100755 --- a/docker/PYROS_DOCKER_RUN +++ b/docker/PYROS_DOCKER_RUN @@ -1,9 +1,9 @@ #!/usr/bin/env bash #if no container is running -if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 2 ] +if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 3 ] then - echo "db_pyros or pyros weren't running, starting them..." + echo "pyros-db or pyros weren't running, starting them..." ./PYROS_DOCKER_START.bat fi diff --git a/docker/PYROS_DOCKER_RUN_WEBSERVER_ONLY b/docker/PYROS_DOCKER_RUN_WEBSERVER_ONLY index d86bb9e..ddb744d 100755 --- a/docker/PYROS_DOCKER_RUN_WEBSERVER_ONLY +++ b/docker/PYROS_DOCKER_RUN_WEBSERVER_ONLY @@ -1,12 +1,12 @@ #!/usr/bin/env bash #if no container is running -if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 2 ] +if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 3 ] then - echo "db_pyros or pyros weren't running, starting them..." + echo "pyros-db or pyros weren't running, starting them..." ./PYROS_DOCKER_START.bat fi docker exec -it pyros python3 pyros.py -d start webserver $@ #docker exec -it pyros python3 pyros.py start webserver $@ #docker exec -it pyros python3 pyros.py -d start -o tnc webserver $@ - +s diff --git a/docker/PYROS_DOCKER_SHELL b/docker/PYROS_DOCKER_SHELL index 83a4a85..733c9c4 100755 --- a/docker/PYROS_DOCKER_SHELL +++ b/docker/PYROS_DOCKER_SHELL @@ -3,7 +3,7 @@ #if no container is running if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 2 ] then - echo "db_pyros or pyros weren't running, starting them..." + echo "pyros-db or pyros weren't running, starting them..." ./PYROS_DOCKER_START.bat fi docker exec -it pyros bash $@ diff --git a/docker/PYROS_DOCKER_TEST b/docker/PYROS_DOCKER_TEST index 8ee910d..eac9642 100755 --- a/docker/PYROS_DOCKER_TEST +++ b/docker/PYROS_DOCKER_TEST @@ -3,7 +3,7 @@ # if no container is running if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 2 ] then - echo "db_pyros or pyros weren't running, starting them..." + echo "pyros-db or pyros weren't running, starting them..." ./PYROS_DOCKER_START.bat fi docker exec -it pyros python3 pyros.py test $@ diff --git a/docker/PYROS_DOCKER_UPDATE b/docker/PYROS_DOCKER_UPDATE index aa9378a..fa5af4c 100755 --- a/docker/PYROS_DOCKER_UPDATE +++ b/docker/PYROS_DOCKER_UPDATE @@ -1,9 +1,9 @@ #!/usr/bin/env bash # If no container is running Start it -if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 2 ] +if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 3 ] then - echo "db_pyros or pyros weren't running, starting them..." + echo "pyros-db or pyros weren't running, starting them..." ./PYROS_DOCKER_START.bat fi diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index bc9dffc..fc84ab0 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -7,7 +7,7 @@ services: image: mysql:8.0.28 command: --default-authentication-plugin=mysql_native_password restart: always - container_name: db_pyros + container_name: pyros-db environment: # 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 - "MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-root}" @@ -69,7 +69,7 @@ services: restart: always phpmyadmin: image: phpmyadmin/phpmyadmin - container_name: pma + container_name: pyros-pma links: - db environment: -- libgit2 0.21.2