taler-deployment

commit 7b464f9638dad3fa74f99906ca361e59e59e7812
parent 573e01b96aef961efd20dfcefde0e5defb8ffb2c
Author: Marcello Stanisci <marcello.stanisci@inria.fr>
Date:   Thu,  5 Jan 2017 13:04:09 +0100

dockerized merchant depends on exchange

Diffstat:
M
docker/exchange/docker-compose.yml
 | 
1
+
M
docker/merchant/Dockerfile
 | 
2
+-

2 files changed, 2 insertions(+), 1 deletion(-)
diff --git 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
@@ -1,4 +1,4 @@
-FROM taler/base
+FROM taler/exchange
 
 RUN git clone git://taler.net/merchant ~/merchant