summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2018-01-30 01:45:48 +0100
committerFlorian Dold <florian.dold@gmail.com>2018-01-30 01:45:48 +0100
commit39079d8af20ad7eebbff41a6f350cfe158c0b3ed (patch)
tree3ea34bcaf73197abe5f544a4a7af1a150813712e /docker
parentdedfddd31dc3f837365f1756741ecadb4d058650 (diff)
downloaddeployment-39079d8af20ad7eebbff41a6f350cfe158c0b3ed.tar.gz
deployment-39079d8af20ad7eebbff41a6f350cfe158c0b3ed.tar.bz2
deployment-39079d8af20ad7eebbff41a6f350cfe158c0b3ed.zip
use url instead of uri
Diffstat (limited to 'docker')
-rwxr-xr-xdocker/merchant/entry_point.sh2
-rw-r--r--docker/taler-full/Dockerfile2
2 files changed, 2 insertions, 2 deletions
diff --git a/docker/merchant/entry_point.sh b/docker/merchant/entry_point.sh
index 19c554b..515c318 100755
--- a/docker/merchant/entry_point.sh
+++ b/docker/merchant/entry_point.sh
@@ -8,6 +8,6 @@ taler-config -s merchantdb-postgres -o config \
taler-config -s merchant -o serve -V tcp
taler-config -s merchant -o port -V 9966
taler-config -s merchant-exchange-test -o master_key -V $(cat /exchange_pub.txt|tr -d '\n')
-taler-config -s merchant-exchange-test -o uri -V $(cat /exchange_url.txt | tr -d '\n')
+taler-config -s merchant-exchange-test -o url -V $(cat /exchange_url.txt | tr -d '\n')
taler-merchant-dbinit -r
taler-merchant-httpd
diff --git a/docker/taler-full/Dockerfile b/docker/taler-full/Dockerfile
index f449737..ac01271 100644
--- a/docker/taler-full/Dockerfile
+++ b/docker/taler-full/Dockerfile
@@ -29,7 +29,7 @@ RUN $HOME/deployment/taler-build/invalidate.sh \
ENV PATH=/root/local/bin:$PATH
RUN taler-config-generate -e -m -C PUDOS -m -e -w test \
- --bank-uri https://bank.test.taler.net \
+ --bank-url https://bank.test.taler.net \
--exchange-bank-account 2 \
--merchant-bank-account 3 \
--trusted