[taler-deployment] branch master updated: update packaging rules

[gnunet]

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

grothoff pushed a commit to branch master
in repository deployment.

The following commit(s) were added to refs/heads/master by this push:
     new bd5189d  update packaging rules
bd5189d is described below

commit bd5189d0232d2ea8e68a2c2ed6895cde9ab38a96
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Fri Sep 8 20:31:58 2023 +0200

    update packaging rules
---
 packaging/debian-docker/Dockerfile                 | 31 +++++++++++++++-------
 .../{taler-build.sh => exchange-build.sh}          | 17 +++++-------
 .../debian-docker/{taler-build.sh => mdb-build.sh} | 19 +++++--------
 .../{taler-build.sh => merchant-build.sh}          | 17 +++++-------
 packaging/ubuntu-docker/Dockerfile                 | 24 ++++++++++-------
 packaging/ubuntu-docker/gnunet-build.sh            |  2 +-
 .../taler-build.sh => ubuntu-docker/mdb-build.sh}  | 19 +++++--------
 7 files changed, 65 insertions(+), 64 deletions(-)

diff --git a/packaging/debian-docker/Dockerfile 
b/packaging/debian-docker/Dockerfile
index 755d944..53435f5 100644
--- a/packaging/debian-docker/Dockerfile
+++ b/packaging/debian-docker/Dockerfile
@@ -18,7 +18,7 @@ RUN apt-get -y install python3-jinja2 doxygen libjose-dev 
iproute2 sudo
 RUN apt-get -y install wget zile
 RUN apt-get -y install libogg-dev gettext net-tools po-debconf 
debhelper-compat dbconfig-pgsql nginx
 RUN apt-get -y install libgtk-3-dev libgladeui-dev libmagic-dev policykit-1
-RUN apt-get -y install dbconfig-no-thanks
+RUN apt-get -y install libnfc-dev
 # For libeufin:
 RUN apt-get -y install openjdk-17-jdk python3-click python3-requests python3
 
@@ -34,19 +34,32 @@ RUN apt-get -y dist-upgrade
 
 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 master
+
 COPY libeufin-build.sh /root/
 RUN chmod +x /root/libeufin-build.sh
-RUN /root/libeufin-build.sh v0.9.2-debian-2
-COPY taler-build.sh /root/
-RUN chmod +x /root/taler-build.sh
-RUN /root/taler-build.sh v0.9.2-debian-2
+RUN /root/libeufin-build.sh master
+
+COPY exchange-build.sh /root/
+RUN chmod +x /root/exchange-build.sh
+RUN /root/exchange-build.sh master
+
+COPY merchant-build.sh /root/
+RUN chmod +x /root/merchant-build.sh
+RUN /root/merchant-build.sh master
+
+COPY mdb-build.sh /root/
+RUN chmod +x /root/sync-build.sh
+RUN /root/sync-build.sh master
+
 COPY sync-build.sh /root/
 RUN chmod +x /root/sync-build.sh
-RUN /root/sync-build.sh v0.9.2
+RUN /root/sync-build.sh master
+
 COPY anastasis-build.sh /root/
 RUN chmod +x /root/anastasis-build.sh
-RUN /root/anastasis-build.sh v0.3.2
+RUN /root/anastasis-build.sh master
+
 COPY wallet-build.sh /root/
 RUN chmod +x /root/wallet-build.sh
-RUN /root/wallet-build.sh v0.9.2-debian-2
+RUN /root/wallet-build.sh master
diff --git a/packaging/debian-docker/taler-build.sh 
b/packaging/debian-docker/exchange-build.sh
similarity index 58%
copy from packaging/debian-docker/taler-build.sh
copy to packaging/debian-docker/exchange-build.sh
index f0fc1b9..36b9ede 100644
--- a/packaging/debian-docker/taler-build.sh
+++ b/packaging/debian-docker/exchange-build.sh
@@ -12,16 +12,13 @@ rm -rf *
 
 pip3 install htmlark
 
-for n in exchange merchant
-do
-    git clone git://git.taler.net/$n
-    cd $n
-    git checkout $1
-    ./bootstrap
-    dpkg-buildpackage -rfakeroot -b -uc -us
-    cd ..
-    dpkg -i *.deb
-done
+git clone git://git.taler.net/exchange
+cd exchange
+git checkout $1
+./bootstrap
+dpkg-buildpackage -rfakeroot -b -uc -us
+cd ..
+dpkg -i *.deb
 
 tar uvf ../packages.tgz *.deb
 cd ..
diff --git a/packaging/debian-docker/taler-build.sh 
b/packaging/debian-docker/mdb-build.sh
similarity index 53%
copy from packaging/debian-docker/taler-build.sh
copy to packaging/debian-docker/mdb-build.sh
index f0fc1b9..d097240 100644
--- a/packaging/debian-docker/taler-build.sh
+++ b/packaging/debian-docker/mdb-build.sh
@@ -10,18 +10,13 @@ cd /build/taler
 # Fetch source
 rm -rf *
 
-pip3 install htmlark
-
-for n in exchange merchant
-do
-    git clone git://git.taler.net/$n
-    cd $n
-    git checkout $1
-    ./bootstrap
-    dpkg-buildpackage -rfakeroot -b -uc -us
-    cd ..
-    dpkg -i *.deb
-done
+git clone git://git.taler.net/taler-mdb
+cd taler-mdb
+git checkout $1
+./bootstrap
+dpkg-buildpackage -rfakeroot -b -uc -us
+cd ..
+dpkg -i *.deb
 
 tar uvf ../packages.tgz *.deb
 cd ..
diff --git a/packaging/debian-docker/taler-build.sh 
b/packaging/debian-docker/merchant-build.sh
similarity index 58%
copy from packaging/debian-docker/taler-build.sh
copy to packaging/debian-docker/merchant-build.sh
index f0fc1b9..5625198 100644
--- a/packaging/debian-docker/taler-build.sh
+++ b/packaging/debian-docker/merchant-build.sh
@@ -12,16 +12,13 @@ rm -rf *
 
 pip3 install htmlark
 
-for n in exchange merchant
-do
-    git clone git://git.taler.net/$n
-    cd $n
-    git checkout $1
-    ./bootstrap
-    dpkg-buildpackage -rfakeroot -b -uc -us
-    cd ..
-    dpkg -i *.deb
-done
+git clone git://git.taler.net/merchant
+cd merchant
+git checkout $1
+./bootstrap
+dpkg-buildpackage -rfakeroot -b -uc -us
+cd ..
+dpkg -i *.deb
 
 tar uvf ../packages.tgz *.deb
 cd ..
diff --git a/packaging/ubuntu-docker/Dockerfile 
b/packaging/ubuntu-docker/Dockerfile
index 7e463d0..92512b3 100644
--- a/packaging/ubuntu-docker/Dockerfile
+++ b/packaging/ubuntu-docker/Dockerfile
@@ -18,7 +18,7 @@ RUN apt-get -y install python3-jinja2 doxygen libjose-dev 
iproute2 sudo
 RUN apt-get -y install wget zile
 RUN apt-get -y install libogg-dev gettext net-tools po-debconf 
debhelper-compat dbconfig-pgsql nginx
 RUN apt-get -y install libgtk-3-dev libgladeui-dev libmagic-dev policykit-1
-RUN apt-get -y install dbconfig-no-thanks
+RUN apt-get -y install libnfc-dev
 # For libeufin:
 RUN apt-get -y install openjdk-17-jdk python3-click python3-requests python3
 
@@ -33,32 +33,36 @@ 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-1
+RUN /root/gnunet-build.sh master
 
 COPY gnunet-gtk-build.sh /root/
 RUN chmod +x /root/gnunet-gtk-build.sh
-RUN /root/gnunet-gtk-build.sh v0.19.3-debian
+RUN /root/gnunet-gtk-build.sh master
 
 COPY libeufin-build.sh /root/
 RUN chmod +x /root/libeufin-build.sh
-RUN /root/libeufin-build.sh v0.9.2-debian-2
+RUN /root/libeufin-build.sh master
 
 COPY exchange-build.sh /root/
 RUN chmod +x /root/exchange-build.sh
-RUN /root/exchange-build.sh v0.9.2-debian-3
+RUN /root/exchange-build.sh master
 
 COPY merchant-build.sh /root/
 RUN chmod +x /root/merchant-build.sh
-RUN /root/merchant-build.sh v0.9.2-debian-5
+RUN /root/merchant-build.sh master
+
+COPY mdb-build.sh /root/
+RUN chmod +x /root/sync-build.sh
+RUN /root/sync-build.sh master
 
 COPY sync-build.sh /root/
 RUN chmod +x /root/sync-build.sh
-RUN /root/sync-build.sh v0.9.2
-COPY anastasis-build.sh /root/
+RUN /root/sync-build.sh master
 
+COPY anastasis-build.sh /root/
 RUN chmod +x /root/anastasis-build.sh
-RUN /root/anastasis-build.sh v0.3.2
+RUN /root/anastasis-build.sh master
 
 COPY wallet-build.sh /root/
 RUN chmod +x /root/wallet-build.sh
-RUN /root/wallet-build.sh v0.9.2-debian-2
+RUN /root/wallet-build.sh master
diff --git a/packaging/ubuntu-docker/gnunet-build.sh 
b/packaging/ubuntu-docker/gnunet-build.sh
index 20efe20..dd89abd 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
+for n in gnunet gnunet-gtk
 do
     git clone git://git.gnunet.org/$n
     cd $n
diff --git a/packaging/debian-docker/taler-build.sh 
b/packaging/ubuntu-docker/mdb-build.sh
similarity index 53%
rename from packaging/debian-docker/taler-build.sh
rename to packaging/ubuntu-docker/mdb-build.sh
index f0fc1b9..d097240 100644
--- a/packaging/debian-docker/taler-build.sh
+++ b/packaging/ubuntu-docker/mdb-build.sh
@@ -10,18 +10,13 @@ cd /build/taler
 # Fetch source
 rm -rf *
 
-pip3 install htmlark
-
-for n in exchange merchant
-do
-    git clone git://git.taler.net/$n
-    cd $n
-    git checkout $1
-    ./bootstrap
-    dpkg-buildpackage -rfakeroot -b -uc -us
-    cd ..
-    dpkg -i *.deb
-done
+git clone git://git.taler.net/taler-mdb
+cd taler-mdb
+git checkout $1
+./bootstrap
+dpkg-buildpackage -rfakeroot -b -uc -us
+cd ..
+dpkg -i *.deb
 
 tar uvf ../packages.tgz *.deb
 cd ..

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