[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-deployment] 01/16: Dockerizing merchant. First steps
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-deployment] 01/16: Dockerizing merchant. First steps. |
Date: |
Thu, 05 Jan 2017 16:36:48 +0100 |
This is an automated email from the git hooks/post-receive script.
marcello pushed a commit to branch master
in repository deployment.
commit 050f022f030daf5488a4a1508189c0fecb27ffdc
Author: Marcello Stanisci <address@hidden>
AuthorDate: Thu Jan 5 12:27:23 2017 +0100
Dockerizing merchant. First steps.
---
docker/{ => exchange}/docker-compose.yml | 6 +++---
docker/merchant/Dockerfile | 9 ++++++---
docker/{ => merchant}/docker-compose.yml | 14 +++++---------
3 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/docker/docker-compose.yml b/docker/exchange/docker-compose.yml
similarity index 77%
copy from docker/docker-compose.yml
copy to docker/exchange/docker-compose.yml
index 58fac20..c0f1b89 100644
--- a/docker/docker-compose.yml
+++ b/docker/exchange/docker-compose.yml
@@ -1,16 +1,16 @@
version: '2'
services:
exchange:
- build: ./exchange
+ build: .
depends_on:
- dbcontainer
base:
- build: ./base
+ build: ../base
image: taler/base
dbcontainer:
image: postgres
nginx:
- build: ./nginx
+ build: ../nginx
depends_on:
- exchange
ports:
diff --git a/docker/merchant/Dockerfile b/docker/merchant/Dockerfile
index 6385c96..5e4a480 100644
--- a/docker/merchant/Dockerfile
+++ b/docker/merchant/Dockerfile
@@ -1,8 +1,8 @@
-FROM taler/exchange
+FROM taler/base
-RUN git clone git://taler.net/merchant /merchant
+RUN git clone git://taler.net/merchant ~/merchant
-WORKDIR /merchant
+WORKDIR $HOME/merchant
RUN ./bootstrap \
&& ./configure CFLAGS='-ggdb -O0' \
@@ -11,3 +11,6 @@ RUN ./bootstrap \
--with-microhttpd=/usr/local \
&& make \
&& make install
+
+ENTRYPOINT taler-merchant-dbinit -t
+ && taler-merchant-httpd
diff --git a/docker/docker-compose.yml b/docker/merchant/docker-compose.yml
similarity index 57%
rename from docker/docker-compose.yml
rename to docker/merchant/docker-compose.yml
index 58fac20..ee78fc1 100644
--- a/docker/docker-compose.yml
+++ b/docker/merchant/docker-compose.yml
@@ -1,17 +1,13 @@
version: '2'
services:
- exchange:
- build: ./exchange
+ merchant:
+ build: .
depends_on:
- dbcontainer
+ ports:
+ - "80:80"
base:
- build: ./base
+ build: ../base
image: taler/base
dbcontainer:
image: postgres
- nginx:
- build: ./nginx
- depends_on:
- - exchange
- ports:
- - "80:80"
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [taler-deployment] 16/16: Update README, (continued)
- [GNUnet-SVN] [taler-deployment] 16/16: Update README, gnunet, 2017/01/09
- [GNUnet-SVN] [taler-deployment] 03/16: dockerized merchant depends on exchange, gnunet, 2017/01/09
- [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 <=
- [GNUnet-SVN] [taler-deployment] 07/16: missing \, gnunet, 2017/01/09
- [GNUnet-SVN] [taler-deployment] 02/16: Explicit ports, gnunet, 2017/01/09
- [GNUnet-SVN] [taler-deployment] 09/16: Fix port order, gnunet, 2017/01/09
- [GNUnet-SVN] [taler-deployment] 05/16: entrypoint as string, gnunet, 2017/01/09