-work on Ubuntu docker for package creation

4 files changed, 35 insertions, 49 deletions

diff --git a/packaging/ubuntu-docker/Dockerfile b/packaging/ubuntu-docker/Dockerfile
index 162846e..2751455 100644
--- a/packaging/ubuntu-docker/Dockerfile
+++ b/packaging/ubuntu-docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:jammy
+FROM ubuntu:kinetic
 # This file is in the public domain.
 #
 # Docker image to build Ubuntu packages of
@@ -15,17 +15,15 @@ RUN apt-get -y install libzbar-dev libmysqlclient-dev mandoc libpulse-dev libgst
 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
+RUN apt-get -y install libgtk-3-dev libgladeui-dev libmagic-dev policykit-1
 RUN apt-get -y install dbconfig-no-thanks
+# For libeufin:
+RUN apt-get -y install openjdk-17-jdk python3-click python3-requests python3
 
 RUN pip install sphinx_rtd_theme
 RUN npm install -g npm
 RUN /usr/local/bin/npm install -g npm pnpm node
 
-COPY taler.list /etc/apt/sources.list.d/
-COPY taler-systems.gpg.key /root
-RUN apt-key add /root/taler-systems.gpg.key
-
 RUN apt-get update
 RUN apt-get -y upgrade
 RUN apt-get -y dist-upgrade
@@ -33,10 +31,13 @@ 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.18.1-deb
+RUN /root/gnunet-build.sh master
+COPY libeufin-build.sh /root/
+RUN chmod +x /root/libeufin-build.sh
+RUN /root/libeufin-build.sh master
 COPY taler-build.sh /root/
 RUN chmod +x /root/taler-build.sh
-RUN /root/taler-build.sh v0.9.0
+RUN /root/taler-build.sh master
 COPY sync-build.sh /root/
 RUN chmod +x /root/sync-build.sh
 RUN /root/sync-build.sh master
diff --git a/packaging/ubuntu-docker/libeufin-build.sh b/packaging/ubuntu-docker/libeufin-build.sh
new file mode 100644
index 0000000..4855af1
--- /dev/null
+++ b/packaging/ubuntu-docker/libeufin-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/libeufin
+cd /build/libeufin
+
+# Fetch source
+rm -rf *
+git clone git://git.taler.net/libeufin
+cd libeufin
+git checkout $1
+./bootstrap
+./configure --prefix=/usr/local
+./gradlew dist
+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/taler-build.sh
index 2e048f4..6e14c56 100644
--- a/packaging/ubuntu-docker/taler-build.sh
+++ b/packaging/ubuntu-docker/taler-build.sh
@@ -11,6 +11,8 @@ cd /build/taler
 # Fetch source
 rm -rf *
 
+pip3 install htmlark
+
 for n in exchange merchant
 do
     git clone git://git.taler.net/$n
diff --git a/packaging/ubuntu-docker/taler-systems.gpg.key b/packaging/ubuntu-docker/taler-systems.gpg.key
deleted file mode 100644
index 149997b..0000000
--- a/packaging/ubuntu-docker/taler-systems.gpg.key
+++ /dev/null
@@ -1,41 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGNBF/uHpABDAC+fBnKB5ohWM69Sw7qbQqbMOq7TeZ8XyFp+j4hTQi0Fwef9bcx
-w8SSgQYBmp73VhkbxxDfbxqVLnpMZRI1UGgr35rbflBZJ29KOh+mgOpo2y21M3xh
-8UwfzgliCN5kRBq7u7nH+MGgsNNZacT6r5icS8FMX509Wcj/k3a7pTtOCInZUeOU
-tpjot0QADqV5fUlEwbFnHxbTS9hZpVFH4knKrzwiDDlw/qO4DCM8w2G8Bs+Jh8VF
-eldKYB9H07/ppOFt88vY660bireC1B3TRdMVYoRqBbcQ8lCVlQzBm1OGodbWq+XH
-G8XciXFoiNBexwTL9ve+8e9omsQ6MnHOEw/d4jlOLp7gMDTIq54/OvrQQmFcagb7
-R4WiC8C78EXEwRxq7f3Jb3pNs1atWurJa7YXkqdJNgcGM6d/Do90RIDPFxVkwokV
-0glnNPmeX2v5Xt77as35tpvE7WiItKDMiOrZ4epwhjrxhJPBYYs9ruTQxmancTSA
-YHHLOckuj/jDY+8AEQEAAbQkVGFsZXIgU3lzdGVtcyBTQSA8Y29udGFjdEB0YWxl
-ci5uZXQ+iQHUBBMBCgA+FiEEAISZPCxs30cafX79JuVGpf5+AmYFAl/uHpACGwMF
-CQPCZwAFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AACgkQJuVGpf5+AmYYgQwAngdY
-msJf8NlKqM2uYh1woi7T3BCfHbdehhhLQHNIuZtLt41ZugPYZNYzQNkaxIiGHAUr
-TPvWTiGOHDH5i4ra5gIuuCqv7Cu9zTbcFvgcp6TKcN4M/eAWtbQ/CKUjbKnYOSf4
-h0M4w78v1nX0SzhwyF/3t+MwEUhmc6ERbtboVl4UskVPfrbUaYvez/W11kmd3ViU
-LqKLuhat3KsjCkX2GbOAGS/rYvkrjUopu5Isoeq+dWgy8Pf4i0Y9VmDUyq7fJYZI
-+dSVzxFsnX8h7V404wZcsNm4TBgJLm5umzYjDYJRSvgkBiPdsF5W6piAgvXHKt93
-cmVkOXhaGNFX7Vjp2/CYlW+CweWV3bgpeCeP+ikoqQf8BMTE+KdgY69yVRfJZAf2
-3K712TvnOW0XOSpcU4Zds+4B9kOkYtsGs1NYd5EyhyL7xin+Xh4u751mRdtEOavE
-6gBcie/PBnqyy2CC1Cz67fIcXfNcsIMy31A65Lfbc2zuWEavEU1yU9WtnNjluQGN
-BF/uHpABDAC04B19Mlu7CKn1Xd2j9UGJdcTsE4Dl3dIw4wWwGx9RNau7uG2ov2Mr
-gvglW9EfJnCqD6QaDjqzi0bKqN1o1e8rEP67T4Zc/EyXIYWaSfeB2Okfry06BJV+
-lf5wc4BnQTAKIkE+zrD+4pKMfugotItCBxXSI5K7BBjTHFdtHTkM4ehJnWPu24Nc
-sP8QZXAWH5a+pUyNe50Z9tTFC0OQGPohyztzPXnA/0GNFL8Nw+ZbZLviaePZc/cs
-ptsDAMX1d1wZrTim56yF58JmKpg/qSAoTu5VVQGOjRV2aL4UUi2ps/23JzWV8O7J
-rKQY9QIXD+zuZ1p55eKjrC2HLV/u/UCwwc+8T+DBZOZgkEbHEUP+tWwBnD5jQJUB
-Wb7xZF1IPSjkP1lVkKLfPSaZIJTDMDqg26TuvBP+hjGoWACycjHowr+GHTv5izKZ
-oKDhY/y0d+0T+lcjBTHyrnJRLdGrVu/LIG9EW+UGPQkjhduSr/ITwdPC8p6Xm2OJ
-+R7wYr+j+7EAEQEAAYkBvAQYAQoAJhYhBACEmTwsbN9HGn1+/SblRqX+fgJmBQJf
-7h6QAhsMBQkDwmcAAAoJECblRqX+fgJmOakL/jXOTEdorszaWIrIvhlEn9TVy+yr
-u57Ze0y8cGvc1mOpxkgZpJgLkOp/u8vt5eSmu96rzXS/lfvJBx69/hMuS6WWnUM9
-hlfKtwhze1JDVFigBeYMkuCC8FnwtpTNRtYisB7ZxEW7WPGXUhmarEaZ/s2zzJEi
-KJLeJAA/TgBRGWmJJUXvnmGqW1FLrHwveDPtg3UBkD81dufpsuo7g+Ab2pB0NzzR
-E47ChCYUI6qCWgFD0GpbH3dp+ZrWG+R/XLQKaxCvPhnTbrna8AzH/yRXv8WpJHom
-SCbzvun4WkBHf1L6XnUf2de+0Om2FXx5HAbR4Gl87GOP/OggCErJXnstsHiifYe/
-CyQ0Gfn9xwzGblPChrjQCyu9cTZb71Lio3qZpc84xPK/xi6LtCJfQrWAVHaXH9XG
-Wxh819zslZ4SsVSHZSYgPlnwDQ9xdmjdxA+xlcFpuT7v8p49ZmrimOouAn0/12E1
-H4p6tTVrJ0X8GPAs9cgCzkFVp3ZUh1zoJl2Z3A==
-=uVVb
------END PGP PUBLIC KEY BLOCK-----