From e1d22a59d94fecd9c7179a1dbc3cfedb203c893b Mon Sep 17 00:00:00 2001 From: Alexis Koralewski Date: Mon, 16 Jan 2023 10:37:28 +0100 Subject: [PATCH] Change redis container name to pyros-redis --- CHANGELOG | 3 +++ docker/PYROS_DOCKER_INSTALL | 2 +- docker/PYROS_DOCKER_RUN | 2 +- docker/PYROS_DOCKER_RUN_WEBSERVER_ONLY | 2 +- docker/PYROS_DOCKER_SHELL | 2 +- docker/PYROS_DOCKER_TEST | 2 +- docker/PYROS_DOCKER_UPDATE | 2 +- docker/docker-compose.yml | 2 +- 8 files changed, 10 insertions(+), 7 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index a0227a3..06ef0fc 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +16-01-2023 (AKo): v0.6.16.0 + - Change redis container name to pyros-redis + 13-01-2023 (AKo): v0.6.16.0 - Add websocket for agent_cmd & agent_survey models & views - Add api tests diff --git a/docker/PYROS_DOCKER_INSTALL b/docker/PYROS_DOCKER_INSTALL index 1663b63..798da88 100755 --- a/docker/PYROS_DOCKER_INSTALL +++ b/docker/PYROS_DOCKER_INSTALL @@ -1,7 +1,7 @@ #!/usr/bin/env bash # if no container is running -if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 3 ] +if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 4 ] then echo "pyros-db or pyros weren't running, starting them..." ./PYROS_DOCKER_START.bat diff --git a/docker/PYROS_DOCKER_RUN b/docker/PYROS_DOCKER_RUN index c2a365b..4522792 100755 --- a/docker/PYROS_DOCKER_RUN +++ b/docker/PYROS_DOCKER_RUN @@ -1,7 +1,7 @@ #!/usr/bin/env bash #if no container is running -if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 3 ] +if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 4 ] then echo "pyros-db or pyros weren't running, starting them..." ./PYROS_DOCKER_START.bat diff --git a/docker/PYROS_DOCKER_RUN_WEBSERVER_ONLY b/docker/PYROS_DOCKER_RUN_WEBSERVER_ONLY index 10def73..413f7bf 100755 --- a/docker/PYROS_DOCKER_RUN_WEBSERVER_ONLY +++ b/docker/PYROS_DOCKER_RUN_WEBSERVER_ONLY @@ -1,7 +1,7 @@ #!/usr/bin/env bash #if no container is running -if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 3 ] +if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 4 ] then echo "pyros-db or pyros weren't running, starting them..." ./PYROS_DOCKER_START.bat diff --git a/docker/PYROS_DOCKER_SHELL b/docker/PYROS_DOCKER_SHELL index 397716c..ea49048 100755 --- a/docker/PYROS_DOCKER_SHELL +++ b/docker/PYROS_DOCKER_SHELL @@ -1,7 +1,7 @@ #!/usr/bin/env bash #if no container is running -if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 3 ] +if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 4 ] then echo "pyros-db or pyros weren't running, starting them..." ./PYROS_DOCKER_START.bat diff --git a/docker/PYROS_DOCKER_TEST b/docker/PYROS_DOCKER_TEST index f94c41b..3252959 100755 --- a/docker/PYROS_DOCKER_TEST +++ b/docker/PYROS_DOCKER_TEST @@ -1,7 +1,7 @@ #!/usr/bin/env bash # if no container is running -if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 3 ] +if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 4 ] then echo "pyros-db or pyros weren't running, starting them..." ./PYROS_DOCKER_START.bat diff --git a/docker/PYROS_DOCKER_UPDATE b/docker/PYROS_DOCKER_UPDATE index fa5af4c..a6cd36f 100755 --- a/docker/PYROS_DOCKER_UPDATE +++ b/docker/PYROS_DOCKER_UPDATE @@ -1,7 +1,7 @@ #!/usr/bin/env bash # If no container is running Start it -if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 3 ] +if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 4 ] then echo "pyros-db or pyros weren't running, starting them..." ./PYROS_DOCKER_START.bat diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 9fdc961..04d75f6 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -26,7 +26,7 @@ services: retries: 20 redis: - container_name: redis + container_name: pyros-redis image: redis:latest restart: always ports: -- libgit2 0.21.2