summaryrefslogtreecommitdiff
path: root/docker/merchant
diff options
context:
space:
mode:
Diffstat (limited to 'docker/merchant')
-rw-r--r--docker/merchant/Dockerfile2
-rwxr-xr-xdocker/merchant/entry_point.sh4
2 files changed, 4 insertions, 2 deletions
diff --git a/docker/merchant/Dockerfile b/docker/merchant/Dockerfile
index 3e5977f..b8d682b 100644
--- a/docker/merchant/Dockerfile
+++ b/docker/merchant/Dockerfile
@@ -13,5 +13,7 @@ RUN ./bootstrap \
&& make install
COPY ./entry_point.sh /
+COPY ./exchange_pub.txt /
+COPY ./exchange_url.txt /
ENTRYPOINT ["/entry_point.sh"]
diff --git a/docker/merchant/entry_point.sh b/docker/merchant/entry_point.sh
index 89df95c..4e15e24 100755
--- a/docker/merchant/entry_point.sh
+++ b/docker/merchant/entry_point.sh
@@ -7,7 +7,7 @@ taler-config -s merchantdb-postgres -o config \
-V "dbname=talertest host=dbcontainer"
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_uri.txt | tr -d '\n')
+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_uri.txt | tr -d '\n')
taler-merchant-dbinit -r
taler-merchant-httpd