[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-deployment] 03/16: dockerized merchant depends on ex
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-deployment] 03/16: dockerized merchant depends on exchange |
Date: |
Thu, 05 Jan 2017 16:36:50 +0100 |
This is an automated email from the git hooks/post-receive script.
marcello pushed a commit to branch master
in repository deployment.
commit 7b464f9638dad3fa74f99906ca361e59e59e7812
Author: Marcello Stanisci <address@hidden>
AuthorDate: Thu Jan 5 13:04:09 2017 +0100
dockerized merchant depends on exchange
---
docker/exchange/docker-compose.yml | 1 +
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
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
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [taler-deployment] branch master updated (37e7f4f -> 6564f8d), gnunet, 2017/01/09
- [GNUnet-SVN] [taler-deployment] 13/16: Fix names.., gnunet, 2017/01/09
- [GNUnet-SVN] [taler-deployment] 16/16: Update README, gnunet, 2017/01/09
- [GNUnet-SVN] [taler-deployment] 03/16: dockerized merchant depends on exchange,
gnunet <=
- [GNUnet-SVN] [taler-deployment] 04/16: dockerized merchant depends on exchange, gnunet, 2017/01/09
- [GNUnet-SVN] [taler-deployment] 11/16: Fix paths.., gnunet, 2017/01/09
- [GNUnet-SVN] [taler-deployment] 14/16: Inverting ports order, gnunet, 2017/01/09
- [GNUnet-SVN] [taler-deployment] 08/16: Fix merchant entrypoint, gnunet, 2017/01/09
- [GNUnet-SVN] [taler-deployment] 12/16: Fix filenames.., gnunet, 2017/01/09
- [GNUnet-SVN] [taler-deployment] 15/16: Update README, gnunet, 2017/01/09
- [GNUnet-SVN] [taler-deployment] 10/16: No newline after master key, gnunet, 2017/01/09
- [GNUnet-SVN] [taler-deployment] 06/16: explcit dependency on exchange, gnunet, 2017/01/09
- [GNUnet-SVN] [taler-deployment] 01/16: Dockerizing merchant. First steps., gnunet, 2017/01/09
- [GNUnet-SVN] [taler-deployment] 07/16: missing \, gnunet, 2017/01/09