diff options
| author | Marcello Stanisci <marcello.stanisci@inria.fr> | 2017-01-05 13:26:28 +0100 |
|---|---|---|
| committer | Marcello Stanisci <marcello.stanisci@inria.fr> | 2017-01-05 13:26:28 +0100 |
| commit | 38dadb60d9014c9ce1d1a239055672d2cdd7ddf8 (patch) | |
| tree | 61b7cf676f85593d9560f318c3f343ab9a4ad63f | |
| parent | 9a221d6b368e82538e27f499e5c42a0714f9aa33 (diff) | |
| download | deployment-38dadb60d9014c9ce1d1a239055672d2cdd7ddf8.tar.gz deployment-38dadb60d9014c9ce1d1a239055672d2cdd7ddf8.tar.bz2 deployment-38dadb60d9014c9ce1d1a239055672d2cdd7ddf8.zip | |
Fix merchant entrypoint
| -rw-r--r-- | docker/merchant/Dockerfile | 5 | ||||
| -rw-r--r-- | docker/merchant/docker-compose.yml | 2 | ||||
| -rwxr-xr-x | 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 |