summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorMS <ms@taler.net>2022-12-05 13:57:22 +0100
committerMS <ms@taler.net>2022-12-05 14:09:30 +0100
commitd4d0f427a2fe50bb4679b4e213c7eb75fc1501dc (patch)
tree3dfa0478c88ba5ed5808161e76ac01efdefdb452 /docker
parentc6589d973064bf46d1655e06759e459c11047603 (diff)
downloaddeployment-d4d0f427a2fe50bb4679b4e213c7eb75fc1501dc.tar.gz
deployment-d4d0f427a2fe50bb4679b4e213c7eb75fc1501dc.tar.bz2
deployment-d4d0f427a2fe50bb4679b4e213c7eb75fc1501dc.zip
earlier containers exit to trigger restart
Diffstat (limited to 'docker')
-rw-r--r--docker/demo/images/exchange/startup.sh2
-rw-r--r--docker/demo/images/merchant/startup.sh2
-rwxr-xr-xdocker/demo/test-docker-gv.sh5
3 files changed, 6 insertions, 3 deletions
diff --git a/docker/demo/images/exchange/startup.sh b/docker/demo/images/exchange/startup.sh
index 7bd0879..e76e5ea 100644
--- a/docker/demo/images/exchange/startup.sh
+++ b/docker/demo/images/exchange/startup.sh
@@ -97,4 +97,4 @@ echo -n "Requesting exchange's /keys..."
curl --max-time 4 -s "${EXCHANGE_URL}keys"
echo DONE
-wait
+wait -n
diff --git a/docker/demo/images/merchant/startup.sh b/docker/demo/images/merchant/startup.sh
index b562c4b..f426107 100644
--- a/docker/demo/images/merchant/startup.sh
+++ b/docker/demo/images/merchant/startup.sh
@@ -176,4 +176,4 @@ echo DONE
is_serving $SYNC_URL
-wait
+wait -n
diff --git a/docker/demo/test-docker-gv.sh b/docker/demo/test-docker-gv.sh
index e932eb1..068d73a 100755
--- a/docker/demo/test-docker-gv.sh
+++ b/docker/demo/test-docker-gv.sh
@@ -1,5 +1,7 @@
#!/bin/bash
+set -eu
+
CURRENCY=KUDOS
HOST="demo.taler.net"
# HOST="int.taler.net"
@@ -9,5 +11,6 @@ taler-wallet-cli --no-throttle api --expect-success 'runIntegrationTest' \
"amountToWithdraw":"'$CURRENCY':3",
"bankBaseUrl":"https://bank.'$HOST'/demobanks/default/access-api/",
"exchangeBaseUrl":"https://exchange.'$HOST'/",
- "merchantBaseUrl":"https://backend.'$HOST'/"
+ "merchantBaseUrl":"https://backend.'$HOST'/",
+ "merchantAuthToken": "'$TALER_DOCKER_APIKEY'"
}'