diff options
| author | Marcello Stanisci <marcello.stanisci@inria.fr> | 2017-01-05 13:04:09 +0100 |
|---|---|---|
| committer | Marcello Stanisci <marcello.stanisci@inria.fr> | 2017-01-05 13:04:09 +0100 |
| commit | 7b464f9638dad3fa74f99906ca361e59e59e7812 (patch) | |
| tree | f8fd12ee8ba4be1b40a98577c3278df3c0aec339 /docker | |
| parent | 573e01b96aef961efd20dfcefde0e5defb8ffb2c (diff) | |
| download | deployment-7b464f9638dad3fa74f99906ca361e59e59e7812.tar.gz deployment-7b464f9638dad3fa74f99906ca361e59e59e7812.tar.bz2 deployment-7b464f9638dad3fa74f99906ca361e59e59e7812.zip | |
dockerized merchant depends on exchange
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/exchange/docker-compose.yml | 1 | ||||
| -rw-r--r-- | docker/merchant/Dockerfile | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/docker/exchange/docker-compose.yml b/docker/exchange/docker-compose.yml index c0f1b89..90e06a2 100644 --- a/docker/exchange/docker-compose.yml +++ b/docker/exchange/docker-compose.yml @@ -4,6 +4,7 @@ services: build: . depends_on: - dbcontainer + image: taler/exchange base: build: ../base image: taler/base diff --git a/docker/merchant/Dockerfile b/docker/merchant/Dockerfile index 5e4a480..262d877 100644 --- a/docker/merchant/Dockerfile +++ b/docker/merchant/Dockerfile @@ -1,4 +1,4 @@ -FROM taler/base +FROM taler/exchange RUN git clone git://taler.net/merchant ~/merchant |