taler-deployment

commit 050f022f030daf5488a4a1508189c0fecb27ffdc
parent 37e7f4f716a76ebc789a38308e1ae89f3b43279c
Author: Marcello Stanisci <marcello.stanisci@inria.fr>
Date:   Thu,  5 Jan 2017 12:27:23 +0100

Dockerizing merchant.  First steps.

Diffstat:
D
docker/docker-compose.yml
 | 
17
-----------------
A
docker/exchange/docker-compose.yml
 | 
17
+++++++++++++++++
M
docker/merchant/Dockerfile
 | 
9
++++++---
A
docker/merchant/docker-compose.yml
 | 
13
+++++++++++++

4 files changed, 36 insertions(+), 20 deletions(-)
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -1,17 +0,0 @@
-version: '2'
-services:
-  exchange:
-    build: ./exchange
-    depends_on:
-      - dbcontainer
-  base:
-    build: ./base
-    image: taler/base
-  dbcontainer:
-    image: postgres
-  nginx:
-    build: ./nginx
-    depends_on:
-      - exchange
-    ports:
-      - "80:80"
diff --git a/docker/exchange/docker-compose.yml b/docker/exchange/docker-compose.yml
@@ -0,0 +1,17 @@
+version: '2'
+services:
+  exchange:
+    build: .
+    depends_on:
+      - dbcontainer
+  base:
+    build: ../base
+    image: taler/base
+  dbcontainer:
+    image: postgres
+  nginx:
+    build: ../nginx
+    depends_on:
+      - exchange
+    ports:
+      - "80:80"
diff --git 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/merchant/docker-compose.yml b/docker/merchant/docker-compose.yml
@@ -0,0 +1,13 @@
+version: '2'
+services:
+  merchant:
+    build: .
+    depends_on:
+      - dbcontainer
+    ports:
+      - "80:80"
+  base:
+    build: ../base
+    image: taler/base
+  dbcontainer:
+    image: postgres