From 6007cb77a683a1c312cff1f1639f76f9af7845bd Mon Sep 17 00:00:00 2001 From: Tim Oxley Date: Tue, 20 Apr 2021 12:32:48 -0400 Subject: [PATCH 1/4] feat: Add services command to list all services. --- streamr-docker-dev/bin.sh | 7 +++++++ streamr-docker-dev/help_scripts.sh | 1 + 2 files changed, 8 insertions(+) diff --git a/streamr-docker-dev/bin.sh b/streamr-docker-dev/bin.sh index d04564a..7b4c5fb 100755 --- a/streamr-docker-dev/bin.sh +++ b/streamr-docker-dev/bin.sh @@ -47,6 +47,10 @@ help() { "$ORIG_DIRNAME/help_scripts.sh" $SERVICES } +services() { + $DOCKER_COMPOSE config --services +} + start() { ip_lines=$(ifconfig | grep -c 10.200.10.1) if [ "$ip_lines" -eq "0" ]; then @@ -272,6 +276,9 @@ wipe ) factory-reset ) factory-reset ;; +services ) + services + ;; * ) help echo "ERROR: Invalid command: $OPERATION" diff --git a/streamr-docker-dev/help_scripts.sh b/streamr-docker-dev/help_scripts.sh index 214ec85..be12b81 100755 --- a/streamr-docker-dev/help_scripts.sh +++ b/streamr-docker-dev/help_scripts.sh @@ -10,6 +10,7 @@ Commands: help show this screen start start services stop stop services + services list all services restart stop and start services wait wait for all health checks to pass ps list docker containers From 07925e52a6507ffbb35dcc69ce38ee07a3a85fce Mon Sep 17 00:00:00 2001 From: Tim Oxley Date: Tue, 20 Apr 2021 12:53:19 -0400 Subject: [PATCH 2/4] feat: Add service aliases. --- streamr-docker-dev/bin.sh | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/streamr-docker-dev/bin.sh b/streamr-docker-dev/bin.sh index 7b4c5fb..ad15eb8 100755 --- a/streamr-docker-dev/bin.sh +++ b/streamr-docker-dev/bin.sh @@ -21,6 +21,22 @@ DOCKER_COMPOSE="docker-compose --ansi never" # don't start these services unless explicitly started EXCEPT_SERVICES_DEFAULT=() # array of string e.g. ("a" "b") +# Service Aliases +NODE_NO_STORAGE='broker-node-no-storage-1 broker-node-no-storage-2' +NODE_STORAGE='broker-node-storage-1' +NODES="$NODE_NO_STORAGE $NODE_STORAGE" +TRACKERS='tracker-1 tracker-2 tracker-3' + +# swap aliases for full names e.g. trackers = tracker-1 tracker-2 tracker-3 +expandServiceAliases() { + local names=$1 + names="${names/broker-no-storage/$BROKER_NO_STORAGE}" + names="${names/broker-storage/$BROKER_STORAGE}" + names="${names/brokers/$BROKERS}" + names="${names/trackers/$TRACKERS}" + echo "$names" +} + # Execute all commands from the root dir of streamr-docker-dev cd "$ROOT_DIR" || exit 1 @@ -238,6 +254,10 @@ while [ $# -gt 0 ]; do # if there are arguments shift done +EXCEPT_SERVICES_DEFAULT=($(expandServiceAliases "${EXCEPT_SERVICES_DEFAULT[*]}")) +SERVICES=$(expandServiceAliases "$SERVICES") +EXCEPT_SERVICES=($(expandServiceAliases "${EXCEPT_SERVICES[*]}")) + # Populate COMMANDS_TO_RUN by executing the relevant method case $OPERATION in "" | help ) From 01142e1030f9863a830ad9a053f1e4093cf9d6ed Mon Sep 17 00:00:00 2001 From: Tim Oxley Date: Wed, 21 Apr 2021 10:55:02 -0400 Subject: [PATCH 3/4] Update aliases, ensure apply to all instances. --- streamr-docker-dev/bin.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/streamr-docker-dev/bin.sh b/streamr-docker-dev/bin.sh index ad15eb8..0108ae3 100755 --- a/streamr-docker-dev/bin.sh +++ b/streamr-docker-dev/bin.sh @@ -30,10 +30,13 @@ TRACKERS='tracker-1 tracker-2 tracker-3' # swap aliases for full names e.g. trackers = tracker-1 tracker-2 tracker-3 expandServiceAliases() { local names=$1 - names="${names/broker-no-storage/$BROKER_NO_STORAGE}" - names="${names/broker-storage/$BROKER_STORAGE}" - names="${names/brokers/$BROKERS}" - names="${names/trackers/$TRACKERS}" + names="${names//node-no-storage/$NODE_NO_STORAGE}" + names="${names//no-storage-nodes/$NODE_NO_STORAGE}" + names="${names//node-storage/$NODE_STORAGE}" + names="${names//storage-nodes/$NODE_STORAGE}" + names="${names//brokers/$NODES}" + names="${names//nodes/$NODES}" + names="${names//trackers/$TRACKERS}" echo "$names" } From 197ac0ac40323af8344ada17b209a6f88ad5423b Mon Sep 17 00:00:00 2001 From: Tim Oxley Date: Tue, 27 Apr 2021 10:43:52 -0400 Subject: [PATCH 4/4] add some comments to alias code --- streamr-docker-dev/bin.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/streamr-docker-dev/bin.sh b/streamr-docker-dev/bin.sh index 0108ae3..427be78 100755 --- a/streamr-docker-dev/bin.sh +++ b/streamr-docker-dev/bin.sh @@ -28,6 +28,8 @@ NODES="$NODE_NO_STORAGE $NODE_STORAGE" TRACKERS='tracker-1 tracker-2 tracker-3' # swap aliases for full names e.g. trackers = tracker-1 tracker-2 tracker-3 +# feel free to add more, just make sure you don't end up using actual service +# names as alias names expandServiceAliases() { local names=$1 names="${names//node-no-storage/$NODE_NO_STORAGE}" @@ -35,7 +37,7 @@ expandServiceAliases() { names="${names//node-storage/$NODE_STORAGE}" names="${names//storage-nodes/$NODE_STORAGE}" names="${names//brokers/$NODES}" - names="${names//nodes/$NODES}" + names="${names//nodes/$NODES}" # brokers/nodes sort of interchangeable names="${names//trackers/$TRACKERS}" echo "$names" }