[taler-deployment] branch master updated: allow merchant and exchange tag to differ in packaging scripts

[gnunet]

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

dold pushed a commit to branch master
in repository deployment.

The following commit(s) were added to refs/heads/master by this push:
     new 49c37b9  allow merchant and exchange tag to differ in packaging scripts
49c37b9 is described below

commit 49c37b93cbf7623ed8d66c9fd23b2530a2b6f4a5
Author: Florian Dold <florian@dold.me>
AuthorDate: Wed Mar 8 17:57:52 2023 +0100

    allow merchant and exchange tag to differ in packaging scripts
---
 packaging/ubuntu-docker/Dockerfile                      | 15 ++++++++++++---
 .../ubuntu-docker/{taler-build.sh => exchange-build.sh} | 17 +++++++----------
 .../ubuntu-docker/{taler-build.sh => merchant-build.sh} | 17 +++++++----------
 3 files changed, 26 insertions(+), 23 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
similarity index 58%
copy from packaging/ubuntu-docker/taler-build.sh
copy to 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/taler-build.sh 
b/packaging/ubuntu-docker/merchant-build.sh
similarity index 58%
rename from packaging/ubuntu-docker/taler-build.sh
rename to packaging/ubuntu-docker/merchant-build.sh
index f0fc1b9..5625198 100644
--- a/packaging/ubuntu-docker/taler-build.sh
+++ b/packaging/ubuntu-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 ..

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