[GNUnet-SVN] [taler-deployment] branch master updated (37e7f4f -> 6564f8d)

[gnunet]

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

marcello pushed a change to branch master
in repository deployment.

    from 37e7f4f  README
     new 050f022  Dockerizing merchant.  First steps.
     new 573e01b  Explicit ports
     new 7b464f9  dockerized merchant depends on exchange
     new a4cebac  dockerized merchant depends on exchange
     new 0133730  entrypoint as string
     new b815246  explcit dependency on exchange
     new 9a221d6  missing \
     new 38dadb6  Fix merchant entrypoint
     new 9256f62  Fix port order
     new a58f4ca  No newline after master key
     new 563dd8b  Fix paths..
     new afe803a  Fix filenames..
     new 919c488  Fix names..
     new 5889ebe  Inverting ports order
     new 572118b  Update README
     new 6564f8d  Update README

The 16 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 docker/README                            | 31 +++++++++++++++++--------------
 docker/{ => exchange}/docker-compose.yml |  8 +++++---
 docker/exchange/entry_point.sh           |  2 ++
 docker/merchant/Dockerfile               | 10 ++++++++--
 docker/{ => merchant}/docker-compose.yml | 20 ++++++++++++--------
 docker/merchant/entry_point.sh           | 13 +++++++++++++
 docker/merchant/exchange_pub.txt         |  1 +
 docker/merchant/exchange_url.txt         |  1 +
 8 files changed, 59 insertions(+), 27 deletions(-)
 copy docker/{ => exchange}/docker-compose.yml (69%)
 rename docker/{ => merchant}/docker-compose.yml (51%)
 create mode 100755 docker/merchant/entry_point.sh
 create mode 100644 docker/merchant/exchange_pub.txt
 create mode 100644 docker/merchant/exchange_url.txt

diff --git a/docker/README b/docker/README
index 8701ab6..b82f510 100644
--- a/docker/README
+++ b/docker/README
@@ -1,19 +1,23 @@
-=== Dockerizing the Exchange ===
+=== Dockerizing the Exchange/Merchant ===
 
-This section shows how to run a "dockerized" exchange.
+This section shows how to run a "dockerized" exchange/merchant.
 The exchange uses postgresql (container) and is served
-by nginx (container).
+by nginx (container).  The merchant instead depends on exchange
+(container) and postgresql (container).
 
 The docker's tools needed are: docker, docker-compose, docker-machine.
 Please refer to Docker's official documentation for their installation
 instructions.
 
-Before starting to build the exchange's image, make sure a docker-machine
-instance is up and running.
+Before starting to build the exchange/merchant's image, make sure a
+docker-machine instance is up and running.
 
 1. Build the images.
 
-From <THIS_REPO/docker>, give:
+<COMPONENT> is either 'exchange' or 'merchant', depending on what is
+to be built.
+
+From <THIS_REPO/docker/<COMPONENT>, give:
 
 $ docker-compose build
 
@@ -22,26 +26,25 @@ and nginx images.
 
 2. Launch the service.
 
-The following command launches the exchange and all other services
+The following command launches the <COMPONENT> and all other services
 it depends on.  From the same directory as the previous step, issue:
 
 $ docker-compose up
 
 If everything worked as expected, you should see some live logging
 from all the containers.
-
-PS. Errors about existing roles/databases can be ignored.
+(Errors about existing roles/databases can be ignored.)
 
 3. Test
 
-Issue the following command to see if the exchange has been correctly
-installed and launched.
+Issue the following command to see if the <COMPONENT> has been
+correctly installed and launched.
 
-$ curl http://`docker-machine ip`:80/
+# Some 'greeting' message should be returned.  Note, the
+# service runs on port 80.
 
-and
+$ curl http://`docker-machine ip`/
 
-$ curl http://`docker-machine ip`:80/keys
 
 === How to use these images ===
 
diff --git a/docker/docker-compose.yml b/docker/exchange/docker-compose.yml
similarity index 69%
copy from docker/docker-compose.yml
copy to docker/exchange/docker-compose.yml
index 58fac20..284af86 100644
--- a/docker/docker-compose.yml
+++ b/docker/exchange/docker-compose.yml
@@ -1,16 +1,18 @@
 version: '2'
 services:
   exchange:
-    build: ./exchange
+    build: .
     depends_on:
       - dbcontainer
+      - base
+    image: taler/exchange
   base:
-    build: ./base
+    build: ../base
     image: taler/base
   dbcontainer:
     image: postgres
   nginx:
-    build: ./nginx
+    build: ../nginx
     depends_on:
       - exchange
     ports:
diff --git a/docker/exchange/entry_point.sh b/docker/exchange/entry_point.sh
index 28c023e..de21a39 100755
--- a/docker/exchange/entry_point.sh
+++ b/docker/exchange/entry_point.sh
@@ -10,7 +10,9 @@ if ! test -a 
$HOME/shared-data/exchange/offline-keys/master.priv; then
   taler-config -s exchangedb-postgres -o db_conn_str \
     -V "dbname=talertest host=dbcontainer"
   taler-config -s exchange -o serve -V tcp
+  taler-config -s exchange -o port -V 8081
   taler-config -s exchange-admin -o serve -V tcp
+  taler-config -s exchange-admin -o port -V 18080
   taler-config -s exchange -o master_public_key \
     -V $(gnunet-ecc -p $HOME/shared-data/exchange/offline-keys/master.priv)
   $HOME/deployment/bin/taler-deployment-config-sign
diff --git a/docker/merchant/Dockerfile b/docker/merchant/Dockerfile
index 6385c96..b8d682b 100644
--- a/docker/merchant/Dockerfile
+++ b/docker/merchant/Dockerfile
@@ -1,8 +1,8 @@
 FROM taler/exchange
 
-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,9 @@ RUN ./bootstrap \
       --with-microhttpd=/usr/local \
     && make \
     && make install
+
+COPY ./entry_point.sh /
+COPY ./exchange_pub.txt /
+COPY ./exchange_url.txt /
+
+ENTRYPOINT ["/entry_point.sh"]
diff --git a/docker/docker-compose.yml b/docker/merchant/docker-compose.yml
similarity index 51%
rename from docker/docker-compose.yml
rename to docker/merchant/docker-compose.yml
index 58fac20..ccbfb70 100644
--- a/docker/docker-compose.yml
+++ b/docker/merchant/docker-compose.yml
@@ -1,17 +1,21 @@
 version: '2'
 services:
-  exchange:
-    build: ./exchange
+  merchant:
+    build: .
     depends_on:
       - dbcontainer
+      - exchange
+    ports:
+      - "80:9966"
   base:
-    build: ./base
+    build: ../base
     image: taler/base
   dbcontainer:
     image: postgres
-  nginx:
-    build: ./nginx
+  exchange:
+    build: ../exchange
     depends_on:
-      - exchange
-    ports:
-      - "80:80"
+      - dbcontainer
+      - base
+    image: taler/exchange
+    entrypoint: "true"
diff --git a/docker/merchant/entry_point.sh b/docker/merchant/entry_point.sh
new file mode 100755
index 0000000..19c554b
--- /dev/null
+++ b/docker/merchant/entry_point.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+ 
+
+(su -c "createuser --host=dbcontainer root" - postgres | exit 0)
+(su -c "createdb --host=dbcontainer talertest" - postgres | exit 0)
+taler-config -s merchantdb-postgres -o config \
+  -V "dbname=talertest host=dbcontainer"
+taler-config -s merchant -o serve -V tcp
+taler-config -s merchant -o port -V 9966
+taler-config -s merchant-exchange-test -o master_key -V $(cat 
/exchange_pub.txt|tr -d '\n')
+taler-config -s merchant-exchange-test -o uri -V $(cat /exchange_url.txt | tr 
-d '\n')
+taler-merchant-dbinit -r
+taler-merchant-httpd
diff --git a/docker/merchant/exchange_pub.txt b/docker/merchant/exchange_pub.txt
new file mode 100644
index 0000000..69f831b
--- /dev/null
+++ b/docker/merchant/exchange_pub.txt
@@ -0,0 +1 @@
+CQQZ9DY3MZ1ARMN5K1VKDETS04Y2QCKMMCFHZSWJWWVN82BTTH00
diff --git a/docker/merchant/exchange_url.txt b/docker/merchant/exchange_url.txt
new file mode 100644
index 0000000..a2f087f
--- /dev/null
+++ b/docker/merchant/exchange_url.txt
@@ -0,0 +1 @@
+https://exchange.demo.taler.net/

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