Renaming pyros containers (pma & db)

Alexis Koralewski
1 parent 4faed281
Showing 9 changed files with 18 additions and 15 deletions Show diff stats
CHANGELOG
docker/PYROS_DOCKER_BUILD.sh
docker/PYROS_DOCKER_INSTALL
docker/PYROS_DOCKER_RUN
docker/PYROS_DOCKER_RUN_WEBSERVER_ONLY
docker/PYROS_DOCKER_SHELL
docker/PYROS_DOCKER_TEST
docker/PYROS_DOCKER_UPDATE
docker/docker-compose.yml
+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
@@ -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
 #!/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
 #!/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
@@ -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 $@
@@ -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 $@
 #!/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
@@ -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: