[taler-deployment] branch master updated: -packaging ng

[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 87d6a67  -packaging ng
87d6a67 is described below

commit 87d6a679f44ad905a345be4c6fd934ab2e937ae7
Author: Florian Dold <florian@dold.me>
AuthorDate: Thu Nov 30 15:16:24 2023 +0100

    -packaging ng
---
 packaging/ng/Dockerfile.debian-bookworm            | 37 ++++++++++++++++++++++
 .../ng/{build.sh => build-debian-bookworm.sh}      |  8 +++--
 packaging/ng/{build.sh => build-ubuntu-kinetic.sh} |  2 +-
 packaging/ng/buildscripts/libeufin-build.sh        | 13 ++++----
 packaging/ng/buildscripts/wallet-build.sh          |  7 ++--
 5 files changed, 53 insertions(+), 14 deletions(-)

diff --git a/packaging/ng/Dockerfile.debian-bookworm 
b/packaging/ng/Dockerfile.debian-bookworm
new file mode 100644
index 0000000..b6aade0
--- /dev/null
+++ b/packaging/ng/Dockerfile.debian-bookworm
@@ -0,0 +1,37 @@
+FROM debian:bookworm
+# This file is in the public domain.
+#
+# Docker image to build Ubuntu packages of
+# GNUnet, GNU Taler and GNU Anastasis.
+#
+ARG DEBIAN_FRONTEND=noninteractive
+
+# Install dependencies
+RUN apt-get update
+RUN apt-get -y upgrade
+RUN apt-get -y install build-essential zip jq python3 python3-pip nodejs npm
+RUN apt-get -y install autoconf automake gcc make libtool libltdl-dev 
libmicrohttpd-dev libpq-dev libsqlite3-dev libunistring-dev libqrencode-dev 
libgcrypt-dev libsodium-dev libargon2-dev libjansson-dev recutils libgmp-dev 
texinfo pkgconf zlib1g-dev libopus-dev libextractor-dev libnss3-dev 
libcurl4-gnutls-dev autopoint
+RUN apt-get -y install libzbar-dev libmariadb-dev-compat libmariadb-dev mandoc 
libpulse-dev libgstreamer1.0-dev libbluetooth-dev iptables miniupnpc libpng-dev
+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 devscripts equivs
+# For libeufin:
+RUN apt-get -y install python3-click python3-requests python3
+
+RUN apt-get -y install \
+  openjdk-17-jre-headless \
+  openjdk-17-jdk-headless \
+  default-jre-headless \
+  ;
+
+
+RUN pip install sphinx_rtd_theme --break-system-packages
+#RUN npm install -g npm
+RUN npm install -g pnpm
+
+RUN apt-get update
+RUN apt-get -y upgrade
+RUN apt-get -y dist-upgrade
diff --git a/packaging/ng/build.sh b/packaging/ng/build-debian-bookworm.sh
similarity index 58%
copy from packaging/ng/build.sh
copy to packaging/ng/build-debian-bookworm.sh
index aca17e0..c259fe7 100755
--- a/packaging/ng/build.sh
+++ b/packaging/ng/build-debian-bookworm.sh
@@ -4,8 +4,8 @@
 
 set -eu
 
-DISTRO=ubuntu
-DISTRO_VERNAME=kinetic
+DISTRO=debian
+DISTRO_VERNAME=bookworm
 LABEL=$DISTRO-$DISTRO_VERNAME
 
 IMAGE_TAG=taler-packaging-$LABEL:latest
@@ -20,4 +20,6 @@ docker build -t $IMAGE_TAG -f $DOCKERFILE .
 mkdir -p $PKGDIR
 
 # echo docker run -it --mount 
type=bind,source="$(pwd)"/buildscripts,target=/buildscripts,readonly --mount 
type=bind,source="$(pwd)"/$PKGDIR,target=/pkgdir $IMAGE_TAG /bin/bash
-docker run -it --entrypoint=/bin/bash --mount 
type=bind,source="$(pwd)"/buildscripts,target=/buildscripts,readonly --mount 
type=bind,source="$(pwd)"/$PKGDIR,target=/pkgdir $IMAGE_TAG 
/buildscripts/build-gnunet.sh
+#docker run -it --entrypoint=/bin/bash --mount 
type=bind,source="$(pwd)"/buildscripts,target=/buildscripts,readonly --mount 
type=bind,source="$(pwd)"/$PKGDIR,target=/pkgdir $IMAGE_TAG 
/buildscripts/build-gnunet.sh
+docker run -it --entrypoint=/bin/bash --mount 
type=bind,source="$(pwd)"/buildscripts,target=/buildscripts,readonly --mount 
type=bind,source="$(pwd)"/$PKGDIR,target=/pkgdir $IMAGE_TAG 
/buildscripts/libeufin-build.sh master
+docker run -it --entrypoint=/bin/bash --mount 
type=bind,source="$(pwd)"/buildscripts,target=/buildscripts,readonly --mount 
type=bind,source="$(pwd)"/$PKGDIR,target=/pkgdir $IMAGE_TAG 
/buildscripts/wallet-build.sh master
diff --git a/packaging/ng/build.sh b/packaging/ng/build-ubuntu-kinetic.sh
similarity index 72%
rename from packaging/ng/build.sh
rename to packaging/ng/build-ubuntu-kinetic.sh
index aca17e0..a27bcac 100755
--- a/packaging/ng/build.sh
+++ b/packaging/ng/build-ubuntu-kinetic.sh
@@ -20,4 +20,4 @@ docker build -t $IMAGE_TAG -f $DOCKERFILE .
 mkdir -p $PKGDIR
 
 # echo docker run -it --mount 
type=bind,source="$(pwd)"/buildscripts,target=/buildscripts,readonly --mount 
type=bind,source="$(pwd)"/$PKGDIR,target=/pkgdir $IMAGE_TAG /bin/bash
-docker run -it --entrypoint=/bin/bash --mount 
type=bind,source="$(pwd)"/buildscripts,target=/buildscripts,readonly --mount 
type=bind,source="$(pwd)"/$PKGDIR,target=/pkgdir $IMAGE_TAG 
/buildscripts/build-gnunet.sh
+#docker run -it --entrypoint=/bin/bash --mount 
type=bind,source="$(pwd)"/buildscripts,target=/buildscripts,readonly --mount 
type=bind,source="$(pwd)"/$PKGDIR,target=/pkgdir $IMAGE_TAG 
/buildscripts/build-gnunet.sh
diff --git a/packaging/ng/buildscripts/libeufin-build.sh 
b/packaging/ng/buildscripts/libeufin-build.sh
index 7229221..f355add 100644
--- a/packaging/ng/buildscripts/libeufin-build.sh
+++ b/packaging/ng/buildscripts/libeufin-build.sh
@@ -4,8 +4,8 @@
 
 set -eu
 unset LD_LIBRARY_PATH
-mkdir -p /build/libeufin
-cd /build/libeufin
+mkdir -p /build
+cd /build
 
 # Fetch source
 rm -rf *
@@ -15,8 +15,9 @@ git checkout $1
 ./bootstrap
 ./configure --prefix=/usr/local
 make deb
-cd ..
-dpkg -i *.deb
 
-tar uvf ../packages.tgz *.deb
-cd ..
+cp /build/*.deb /pkgdir/
+
+dpkg -i /build/*.deb
+
+
diff --git a/packaging/ng/buildscripts/wallet-build.sh 
b/packaging/ng/buildscripts/wallet-build.sh
index bf3fa80..029d90a 100644
--- a/packaging/ng/buildscripts/wallet-build.sh
+++ b/packaging/ng/buildscripts/wallet-build.sh
@@ -5,8 +5,8 @@
 set -eu
 unset LD_LIBRARY_PATH
 
-mkdir -p /build/wallet
-cd /build/wallet
+mkdir -p /build
+cd /build
 
 # Fetch source
 rm -rf *
@@ -27,6 +27,5 @@ make install
 dpkg-buildpackage -rfakeroot -b -uc -us
 cd ..
 
-tar uvf ../../../packages.tgz *.deb
 
-cd ../../..
+cp /build/wallet-core/packages/*.deb /pkgdir/

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