[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-deployment] 11/16: Fix paths..
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-deployment] 11/16: Fix paths.. |
Date: |
Thu, 05 Jan 2017 16:36:58 +0100 |
This is an automated email from the git hooks/post-receive script.
marcello pushed a commit to branch master
in repository deployment.
commit 563dd8b591dcf2736a2fcd5eee0db071d169917f
Author: Marcello Stanisci <address@hidden>
AuthorDate: Thu Jan 5 13:35:16 2017 +0100
Fix paths..
---
docker/merchant/Dockerfile | 2 ++
docker/merchant/entry_point.sh | 4 ++--
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
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [taler-deployment] branch master updated (37e7f4f -> 6564f8d), gnunet, 2017/01/09
- [GNUnet-SVN] [taler-deployment] 13/16: Fix names.., gnunet, 2017/01/09
- [GNUnet-SVN] [taler-deployment] 16/16: Update README, gnunet, 2017/01/09
- [GNUnet-SVN] [taler-deployment] 03/16: dockerized merchant depends on exchange, gnunet, 2017/01/09
- [GNUnet-SVN] [taler-deployment] 04/16: dockerized merchant depends on exchange, gnunet, 2017/01/09
- [GNUnet-SVN] [taler-deployment] 11/16: Fix paths..,
gnunet <=
- [GNUnet-SVN] [taler-deployment] 14/16: Inverting ports order, gnunet, 2017/01/09
- [GNUnet-SVN] [taler-deployment] 08/16: Fix merchant entrypoint, gnunet, 2017/01/09
- [GNUnet-SVN] [taler-deployment] 12/16: Fix filenames.., gnunet, 2017/01/09
- [GNUnet-SVN] [taler-deployment] 15/16: Update README, gnunet, 2017/01/09
- [GNUnet-SVN] [taler-deployment] 10/16: No newline after master key, gnunet, 2017/01/09
- [GNUnet-SVN] [taler-deployment] 06/16: explcit dependency on exchange, gnunet, 2017/01/09
- [GNUnet-SVN] [taler-deployment] 01/16: Dockerizing merchant. First steps., gnunet, 2017/01/09
- [GNUnet-SVN] [taler-deployment] 07/16: missing \, gnunet, 2017/01/09
- [GNUnet-SVN] [taler-deployment] 02/16: Explicit ports, gnunet, 2017/01/09
- [GNUnet-SVN] [taler-deployment] 09/16: Fix port order, gnunet, 2017/01/09