[taler-deployment] branch master updated (eb28433 -> f41e8ab)

[gnunet]

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

dold pushed a change to branch master
in repository deployment.

    from eb28433  netzbon readme
     new 26e7152  ubuntu-docker: split
     new f41e8ab  minor readme clarification

The 2 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:
 netzbon/README                                                | 11 ++++++-----
 packaging/ubuntu-docker/.gitignore                            |  1 +
 packaging/ubuntu-docker/Dockerfile                            |  8 ++++++--
 packaging/ubuntu-docker/gnunet-build.sh                       |  2 +-
 .../gnunet-build.sh => ubuntu-docker/gnunet-gtk-build.sh}     |  2 +-
 5 files changed, 15 insertions(+), 9 deletions(-)
 create mode 100644 packaging/ubuntu-docker/.gitignore
 copy packaging/{debian-docker/gnunet-build.sh => 
ubuntu-docker/gnunet-gtk-build.sh} (93%)

diff --git a/netzbon/README b/netzbon/README
index d32c225..e6ef156 100644
--- a/netzbon/README
+++ b/netzbon/README
@@ -10,8 +10,9 @@ into Nginx configuration file(s).
 Domain names
 ============
 
-Assuming a main domain at netzbon.ch, this setup expects the
-following subdomains to be reachable:
+Assuming a main domain at netzbon.ch (i.e. "netzbon.ch" will be given as the
+value for the domain during configuration), this setup expects the following
+subdomains to be reachable:
 
 - exchange.netzbon.ch
 - bank.netzbon.ch
@@ -25,9 +26,9 @@ and the administrator can create bank accounts and wire funds
 to them.  The script "transfer.sh" in this directory serves this
 purpose; running it without arguments shows the usage instructions.
 
-Note: The wiring of funds causes the amount to be subtracted to
-the administrator.  Following is one example of wiring funds from
-the administrator to the "shop" bank account. 
+Note: The wiring of funds causes the amount to be subtracted from the "admin"
+bank account.  Following is one example of wiring funds from the administrator
+to the "shop" bank account. 
 
   $ ./transfer.sh shop NETZBON:10 "welcome amount"
 
diff --git a/packaging/ubuntu-docker/.gitignore 
b/packaging/ubuntu-docker/.gitignore
new file mode 100644
index 0000000..849ddff
--- /dev/null
+++ b/packaging/ubuntu-docker/.gitignore
@@ -0,0 +1 @@
+dist/
diff --git a/packaging/ubuntu-docker/Dockerfile 
b/packaging/ubuntu-docker/Dockerfile
index 779bd6e..7e463d0 100644
--- a/packaging/ubuntu-docker/Dockerfile
+++ b/packaging/ubuntu-docker/Dockerfile
@@ -33,7 +33,11 @@ RUN apt-get -y dist-upgrade
 # ADD "https://www.random.org/cgi-bin/randbyte?nbytes=10&format=h"; skipcache
 COPY gnunet-build.sh /root/
 RUN chmod +x /root/gnunet-build.sh
-RUN /root/gnunet-build.sh v0.19.3-debian
+RUN /root/gnunet-build.sh v0.19.3-debian-1
+
+COPY gnunet-gtk-build.sh /root/
+RUN chmod +x /root/gnunet-gtk-build.sh
+RUN /root/gnunet-gtk-build.sh v0.19.3-debian
 
 COPY libeufin-build.sh /root/
 RUN chmod +x /root/libeufin-build.sh
@@ -45,7 +49,7 @@ RUN /root/exchange-build.sh v0.9.2-debian-3
 
 COPY merchant-build.sh /root/
 RUN chmod +x /root/merchant-build.sh
-RUN /root/merchant-build.sh v0.9.2-debian-4
+RUN /root/merchant-build.sh v0.9.2-debian-5
 
 COPY sync-build.sh /root/
 RUN chmod +x /root/sync-build.sh
diff --git a/packaging/ubuntu-docker/gnunet-build.sh 
b/packaging/ubuntu-docker/gnunet-build.sh
index dd89abd..20efe20 100644
--- a/packaging/ubuntu-docker/gnunet-build.sh
+++ b/packaging/ubuntu-docker/gnunet-build.sh
@@ -11,7 +11,7 @@ cd /build/gnunet
 # Fetch source
 rm -rf *
 
-for n in gnunet gnunet-gtk
+for n in gnunet
 do
     git clone git://git.gnunet.org/$n
     cd $n
diff --git a/packaging/debian-docker/gnunet-build.sh 
b/packaging/ubuntu-docker/gnunet-gtk-build.sh
similarity index 93%
copy from packaging/debian-docker/gnunet-build.sh
copy to packaging/ubuntu-docker/gnunet-gtk-build.sh
index dd89abd..f480c3c 100644
--- a/packaging/debian-docker/gnunet-build.sh
+++ b/packaging/ubuntu-docker/gnunet-gtk-build.sh
@@ -11,7 +11,7 @@ cd /build/gnunet
 # Fetch source
 rm -rf *
 
-for n in gnunet gnunet-gtk
+for n in gnunet-gtk
 do
     git clone git://git.gnunet.org/$n
     cd $n

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.