wip

TouK · Dec 6, 2023 · f7d9843 · f7d9843
1 parent 0349170
commit f7d9843
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/common/tests/benchmark/runBenchmarkForDockerStreaming.sh b/common/tests/benchmark/runBenchmarkForDockerStreaming.sh
@@ -3,8 +3,7 @@
 cd "$(dirname "$0")"
 
 displayLogs() {
-    export BASE_PATH="../../docker/streaming/"
-    ../../../docker/common/displayAllDockerLogs.sh 
+    ../../../docker/streaming/displayAllStreamingDockerLogs.sh 
 }
 
 trap displayLogs ERR

diff --git a/docker/streaming/displayAllStreamingDockerLogs.sh b/docker/streaming/displayAllStreamingDockerLogs.sh
@@ -0,0 +1,10 @@
+#!/bin/bash -e
+
+cd "$(dirname "$0")"
+
+source ../../common/scripts/utils.sh
+
+export BASE_PATH=$(pwd)
+export ADDITIONAL_COMPOSE_FILE="-f $(fullPath ./docker-compose-streaming.yml)"
+
+../common/displayAllDockerLogs.sh 
diff --git a/docker/streaming/showDockerServices.sh b/docker/streaming/showDockerServices.sh
@@ -14,4 +14,4 @@ source ../../common/scripts/utils.sh
 
 export ADDITIONAL_COMPOSE_FILE="-f $(fullPath ./docker-compose-streaming.yml)"
 
-../common/invokeDocker.sh ps
+../common/invokeDocker.sh ps -a
diff --git a/docker/streaming/waitForDockerHealthchecks.sh b/docker/streaming/waitForDockerHealthchecks.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -ex
+#!/bin/bash -e
 
 cd "$(dirname "$0")"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,4 +14,4 @@ source ../../common/scripts/utils.sh

		export ADDITIONAL_COMPOSE_FILE="-f $(fullPath ./docker-compose-streaming.yml)"

		../common/invokeDocker.sh ps
		../common/invokeDocker.sh ps -a