[GNUnet-SVN] [taler-deployment] 04/16: dockerized merchant depends on exchange

[gnunet]

This is an automated email from the git hooks/post-receive script.

marcello pushed a commit to branch master
in repository deployment.

commit a4cebace6de4d373cffb90ba1f97b88e106f0925
Author: Marcello Stanisci <address@hidden>
AuthorDate: Thu Jan 5 13:14:44 2017 +0100

    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

-- 
To stop receiving notification emails like this one, please contact
address@hidden