[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-deployment] 08/16: Fix merchant entrypoint
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-deployment] 08/16: Fix merchant entrypoint |
Date: |
Thu, 05 Jan 2017 16:36:55 +0100 |
This is an automated email from the git hooks/post-receive script.
marcello pushed a commit to branch master
in repository deployment.
commit 38dadb60d9014c9ce1d1a239055672d2cdd7ddf8
Author: Marcello Stanisci <address@hidden>
AuthorDate: Thu Jan 5 13:26:28 2017 +0100
Fix merchant entrypoint
---
docker/merchant/Dockerfile | 5 +++--
docker/merchant/docker-compose.yml | 2 +-
docker/merchant/entry_point.sh | 4 ++--
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/docker/merchant/Dockerfile b/docker/merchant/Dockerfile
index fc8307a..3e5977f 100644
--- a/docker/merchant/Dockerfile
+++ b/docker/merchant/Dockerfile
@@ -12,5 +12,6 @@ RUN ./bootstrap \
&& make \
&& make install
-ENTRYPOINT taler-merchant-dbinit -t \
- && taler-merchant-httpd
+COPY ./entry_point.sh /
+
+ENTRYPOINT ["/entry_point.sh"]
diff --git a/docker/merchant/docker-compose.yml
b/docker/merchant/docker-compose.yml
index 1605dca..ccbfb70 100644
--- a/docker/merchant/docker-compose.yml
+++ b/docker/merchant/docker-compose.yml
@@ -6,7 +6,7 @@ services:
- dbcontainer
- exchange
ports:
- - "80:80"
+ - "80:9966"
base:
build: ../base
image: taler/base
diff --git a/docker/merchant/entry_point.sh b/docker/merchant/entry_point.sh
index 82f3777..3cd01fb 100755
--- a/docker/merchant/entry_point.sh
+++ b/docker/merchant/entry_point.sh
@@ -9,5 +9,5 @@ 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)
taler-config -s merchant-exchange-test -o uri -V $(cat ./exchange_uri.txt)
-taler-exchange-dbinit -r
-taler-exchange-httpd
+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, 2017/01/09
- [GNUnet-SVN] [taler-deployment] 14/16: Inverting ports order, gnunet, 2017/01/09
- [GNUnet-SVN] [taler-deployment] 08/16: Fix merchant entrypoint,
gnunet <=
- [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
- [GNUnet-SVN] [taler-deployment] 05/16: entrypoint as string, gnunet, 2017/01/09