allow merchant and exchange tag to differ in packaging scripts

3 files changed, 43 insertions, 13 deletions

diff --git a/packaging/ubuntu-docker/Dockerfile b/packaging/ubuntu-docker/Dockerfile
index d9a746c..19d8448 100644
--- a/packaging/ubuntu-docker/Dockerfile
+++ b/packaging/ubuntu-docker/Dockerfile
@@ -34,18 +34,27 @@ 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
+
 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
+
+COPY exchange-build.sh /root/
+RUN chmod +x /root/exchange-build.sh
+RUN /root/exchange-build.sh v0.9.2-debian-2
+
+COPY merchant-build.sh /root/
+RUN chmod +x /root/merchant-build.sh
+RUN /root/merchant-build.sh v0.9.2-debian-3
+
 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 chmod +x /root/anastasis-build.sh
 RUN /root/anastasis-build.sh v0.3.2
+
 COPY wallet-build.sh /root/
 RUN chmod +x /root/wallet-build.sh
 RUN /root/wallet-build.sh v0.9.2-debian-2
diff --git a/packaging/ubuntu-docker/taler-build.sh b/packaging/ubuntu-docker/exchange-build.sh
index f0fc1b9..36b9ede 100644
--- a/packaging/ubuntu-docker/taler-build.sh
+++ b/packaging/ubuntu-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/ubuntu-docker/merchant-build.sh b/packaging/ubuntu-docker/merchant-build.sh
new file mode 100644
index 0000000..5625198
--- /dev/null
+++ b/packaging/ubuntu-docker/merchant-build.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+# This file is in the public domain.
+# Helper script to build the latest DEB packages in the container.
+
+set -eu
+unset LD_LIBRARY_PATH
+mkdir -p /build/taler
+cd /build/taler
+
+# Fetch source
+rm -rf *
+
+pip3 install htmlark
+
+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 ..