diff options
| author | Marcello Stanisci <marcello.stanisci@inria.fr> | 2017-01-05 13:35:16 +0100 |
|---|---|---|
| committer | Marcello Stanisci <marcello.stanisci@inria.fr> | 2017-01-05 13:35:16 +0100 |
| commit | 563dd8b591dcf2736a2fcd5eee0db071d169917f (patch) | |
| tree | c52f5b47eef11ed514c8f921592b23b36672bcd2 /docker/merchant | |
| parent | a58f4ca09fbdb2d265b7db577627cae71a3a2531 (diff) | |
| download | deployment-563dd8b591dcf2736a2fcd5eee0db071d169917f.tar.gz deployment-563dd8b591dcf2736a2fcd5eee0db071d169917f.tar.bz2 deployment-563dd8b591dcf2736a2fcd5eee0db071d169917f.zip | |
Fix paths..
Diffstat (limited to 'docker/merchant')
| -rw-r--r-- | docker/merchant/Dockerfile | 2 | ||||
| -rwxr-xr-x | 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 |