aljaz/cyphernode
1
0
Fork 0
mirror of https://github.com/aljazceru/cyphernode.git synced 2025-12-17 04:35:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #251 from BHodl/releases/v0.8.0-fix_test_monitor

Browse Source 
Fix test container name
This commit is contained in:
kexkey
2022-03-22 22:31:21 -04:00
committed by GitHub
parent 807a3fea6d 74ecd5646f
commit fc919d3859
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cyphernodeconf_docker/templates/installer/docker/docker-compose.yaml
View File

@@ -1,4 +1,7 @@
version: "3" version: "3"
<% if ( docker_mode !== 'swarm' ) { %>
name: cyphernode
<% } %>
services: services:

4
cyphernodeconf_docker/templates/installer/testfeatures.sh
View File

@@ -84,7 +84,7 @@ checkpostgres() {
echo -en "\r\n\e[1;36mTesting Postgres... " > /dev/console echo -en "\r\n\e[1;36mTesting Postgres... " > /dev/console
local rc local rc
pg_isready -h postgres -U cyphernode pg_isready -h postgres -U cyphernode > /dev/null
[ "${?}" -ne "0" ] && return 105 [ "${?}" -ne "0" ] && return 105
echo -e "\e[1;36mPostgres rocks!" > /dev/console echo -e "\e[1;36mPostgres rocks!" > /dev/console
@@ -109,7 +109,7 @@ checknotifier() {
local response local response
local returncode local returncode
nc -vlp1111 -e sh -c 'echo -en "HTTP/1.1 200 OK\\r\\n\\r\\n" ; date >&2 ; timeout 1 tee /dev/tty | cat ; ' & nc -lp1111 -e sh -c 'echo -en "HTTP/1.1 200 OK\\r\\n\\r\\n" ; timeout 1 tee /dev/null ;' > /dev/null &
response=$(mosquitto_rr -h broker -W 15 -t notifier -e "response/$$" -m "{\"response-topic\":\"response/$$\",\"cmd\":\"web\",\"url\":\"http://$(hostname):1111/notifiertest\",\"tor\":false}") response=$(mosquitto_rr -h broker -W 15 -t notifier -e "response/$$" -m "{\"response-topic\":\"response/$$\",\"cmd\":\"web\",\"url\":\"http://$(hostname):1111/notifiertest\",\"tor\":false}")
returncode=$? returncode=$?
[ "${returncode}" -ne "0" ] && return 115 [ "${returncode}" -ne "0" ] && return 115