summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcello Stanisci <marcello.stanisci@inria.fr>2017-01-05 13:14:44 +0100
committerMarcello Stanisci <marcello.stanisci@inria.fr>2017-01-05 13:14:44 +0100
commita4cebace6de4d373cffb90ba1f97b88e106f0925 (patch)
tree4eef91853a8e9a91e3b2e8f72917c3fbf2a132c2
parent7b464f9638dad3fa74f99906ca361e59e59e7812 (diff)
downloaddeployment-a4cebace6de4d373cffb90ba1f97b88e106f0925.tar.gz
deployment-a4cebace6de4d373cffb90ba1f97b88e106f0925.tar.bz2
deployment-a4cebace6de4d373cffb90ba1f97b88e106f0925.zip
dockerized merchant depends on exchange
-rw-r--r--docker/exchange/docker-compose.yml1
-rw-r--r--docker/merchant/docker-compose.yml7
2 files changed, 8 insertions, 0 deletions
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