taler-deployment

commit fd697e7b3903f4a29360044e3193e15e76d17185
parent d8a22730d80acd445818d60cfff9872448d26e59
Author: Christian Grothoff <christian@grothoff.org>
Date:   Sat, 25 Feb 2023 13:30:24 +0100

fix wallet-cli and harness package builds

Diffstat:
M
packaging/debian-docker/Dockerfile
 | 
12
++++++------
M
packaging/debian-docker/libeufin-build.sh
 | 
3
+--
M
packaging/debian-docker/wallet-build.sh
 | 
5
+++++
M
packaging/ubuntu-docker/Dockerfile
 | 
12
++++++------
M
packaging/ubuntu-docker/libeufin-build.sh
 | 
3
+--
M
packaging/ubuntu-docker/wallet-build.sh
 | 
5
+++++

6 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/packaging/debian-docker/Dockerfile b/packaging/debian-docker/Dockerfile
@@ -34,19 +34,19 @@ 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.2-1
+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.1
+RUN /root/libeufin-build.sh v0.9.2
 COPY taler-build.sh /root/
 RUN chmod +x /root/taler-build.sh
-RUN /root/taler-build.sh v0.9.1
+RUN /root/taler-build.sh v0.9.2
 COPY sync-build.sh /root/
 RUN chmod +x /root/sync-build.sh
-RUN /root/sync-build.sh v0.9.1
+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.1
+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.1
+RUN /root/wallet-build.sh v0.9.2-debian-1
diff --git a/packaging/debian-docker/libeufin-build.sh b/packaging/debian-docker/libeufin-build.sh
@@ -15,8 +15,7 @@ cd libeufin
 git checkout $1
 ./bootstrap
 ./configure --prefix=/usr/local
-./gradlew execArch
-dpkg-buildpackage -rfakeroot -b -uc -us
+make deb
 cd ..
 dpkg -i *.deb
 
diff --git a/packaging/debian-docker/wallet-build.sh b/packaging/debian-docker/wallet-build.sh
@@ -16,10 +16,15 @@ cd wallet-core
 git checkout $1
 ./bootstrap
 ./configure --prefix=/usr
+make
 cd packages/taler-wallet-cli
 ./configure --prefix=/usr
 make install
 dpkg-buildpackage -rfakeroot -b -uc -us
+cd ../taler-harness
+./configure --prefix=/usr
+make install
+dpkg-buildpackage -rfakeroot -b -uc -us
 cd ../
 
 tar uvf ../../../packages.tgz *.deb
diff --git a/packaging/ubuntu-docker/Dockerfile b/packaging/ubuntu-docker/Dockerfile
@@ -33,19 +33,19 @@ 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.2-1
+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.1
+RUN /root/libeufin-build.sh v0.9.2
 COPY taler-build.sh /root/
 RUN chmod +x /root/taler-build.sh
-RUN /root/taler-build.sh v0.9.1
+RUN /root/taler-build.sh v0.9.2
 COPY sync-build.sh /root/
 RUN chmod +x /root/sync-build.sh
-RUN /root/sync-build.sh v0.9.1
+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.1
+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.1
+RUN /root/wallet-build.sh v0.9.2-debian-1
diff --git a/packaging/ubuntu-docker/libeufin-build.sh b/packaging/ubuntu-docker/libeufin-build.sh
@@ -15,8 +15,7 @@ cd libeufin
 git checkout $1
 ./bootstrap
 ./configure --prefix=/usr/local
-./gradlew execArch
-dpkg-buildpackage -rfakeroot -b -uc -us
+make deb
 cd ..
 dpkg -i *.deb
 
diff --git a/packaging/ubuntu-docker/wallet-build.sh b/packaging/ubuntu-docker/wallet-build.sh
@@ -16,10 +16,15 @@ cd wallet-core
 git checkout $1
 ./bootstrap
 ./configure --prefix=/usr
+make
 cd packages/taler-wallet-cli
 ./configure --prefix=/usr
 make install
 dpkg-buildpackage -rfakeroot -b -uc -us
+cd ../taler-harness
+./configure --prefix=/usr
+make install
+dpkg-buildpackage -rfakeroot -b -uc -us
 cd ..
 
 tar uvf ../../../packages.tgz *.deb