From a4cebace6de4d373cffb90ba1f97b88e106f0925 Mon Sep 17 00:00:00 2001
From: Marcello Stanisci <marcello.stanisci@inria.fr>
Date: Thu, 5 Jan 2017 13:14:44 +0100
Subject: dockerized merchant depends on exchange

---
 docker/exchange/docker-compose.yml | 1 +
 docker/merchant/docker-compose.yml | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/docker/exchange/docker-compose.yml b/docker/exchange/docker-compose.yml
index 90e06a2..284af86 100644
--- a/docker/exchange/docker-compose.yml
+++ b/docker/exchange/docker-compose.yml
@@ -4,6 +4,7 @@ services:
     build: .
     depends_on:
       - dbcontainer
+      - base
     image: taler/exchange
   base:
     build: ../base
diff --git a/docker/merchant/docker-compose.yml b/docker/merchant/docker-compose.yml
index ee78fc1..a427418 100644
--- a/docker/merchant/docker-compose.yml
+++ b/docker/merchant/docker-compose.yml
@@ -11,3 +11,10 @@ services:
     image: taler/base
   dbcontainer:
     image: postgres
+  exchange:
+    build: ../exchange
+    depends_on:
+      - dbcontainer
+      - base
+    image: taler/exchange
+    entrypoint: true
-- 
cgit v1.2.3